Merged in changes from v1.65 to ease syncing