CAMEL-7370: Polish