INT-3286: Polishing