merged  v1.64-external-sync to address syncing problems on high server load