Merge CPP removal patches.