Merge "Cmake, change files missing from previous commit"