Merge "Fix crop scaling with BSL" into sc-dev