move allong with master, vmsync fix for 4.6