PURE-241: Replacing "scale" with "resolution".
PURE-241: Replacing "scale" with "resolution".
PURE-241: Replacing "scale" with "resolution".
Merge remote-tracking branch 'origin/PURE-241'