CAMEL-6686: Polished.