INT-3140: Polishing according PR comments