Merge "Fix round cap approximation to understand scale" into mnc-dev