INT-651: Polishing #2