GBE-459: Scale info is not calculated correctly
Merge remote-tracking branch 'origin/GBE-459'