Merge "Fix a serialization issue in sync op reporting" into sc-dev