add check for 'position' property in re-scale
Merge branch 'development' into staging