Merge pull request #11979 from slavapestov/versioned-attr-fixes

Fixes for @_versioned attribute