Including cms in post-2.4 builds for sapphire