Merge branch 'release-17.0' into develop
reverted map zoom level (7276)
Merge branch 'release-17.1'