committed support for CLS already present in released binaries