Merge pull request #785 from ikesyo/more-versioned-attribute