INT-3139: Polishing