Polished.
CAMEL-7142: Polished.