Model, fix getters #2027
Merge pull request #2820 from mruz/2.0.0

[2.0.0] Model, fix getters #2027