Ensure we always define attribute methods
Merge pull request #15689 from sgrif/sg-attribute-methods

Ensure we always define attribute methods