INT-2312: Polishing