INT-2595: Polishing according PR comments