PURE-241: Replacing "scale" with "resolution".
Merge branch 'PURE-241' into Release-2.0.0