Merge "Removed duplicate CMake functionality" into release-4-6