Sync improvements - addresses issue #69915038 (PT)