INT-2899: Polishing