CAMEL-8103: Polish