Fixed scaling (ABM-470)
Merge branch 'develop' into jef
Merge branch 'jef' into develop