Merge "Account for scaling effects when cropping" into lmp-dev