Yes, unfortunately.  See discussions about CMake above.  I can split CMake changes.  I don't see what else to split.