Merge 2.3 code for sync #2