Merge "Optimize the scaling calculation" into experimental