INT-2455: Polishing according PR comments