CAMEL-7452: Polished