INT-2998: Polishing