Ready for CM-11.0