No functional change, this version just contains some of the CMake fixes we were already providing as local patches