Fix the resync with trunk