Merge "Fix sync back-off" into oc-dr1-dev