INT-3468: Polishing