Bug fix of scale
Bug fix of scale
Merge branch 'master' into i2