Merge "msm: cpr: Add margin and range for step quot"