Workaround for accessor methods appearing inside other methods
Merge branch 'develop'