Add scale to formula.
Merge branch 'master' into i2
Merge from master