Merge "Fix for the missing sync bug" into nyc-dev