Re-sync to CM (Single commit for easy revert if needed)