CAMEL-7369: Polish