Merge "Change SR_diff calculation and representation"