INT-2755: Polishing