IDEA-CR-13744 Fixed comments from review