INT-3380: Polishing