Unify cattr and mattr accessors declarations
Merge pull request #11197 from gsamokovarov/unify-mattr-cattr

Unify cattr and mattr accessors declarations