Geo model helpers
Merge branch 'develop'