INT-3457: Polishing