CAMEL-8065: Fixed CS