CAMEL-6782: Polished.