Merge the latest CM patches