Merge scale changes
Bit of a screwup between not merging the Plasma/5.10 branch and this slightly improved version.