CAMEL-6689: Polished