Resync for Milestone 9