cherry-pick f92ef31ee91a4a4e1f30e463f0a2509c5ce6f1e8
move footprint scale-factor to GlobalConstants
misplaced '}'
Merge branch 'release' into develop