Merge branch 'IDEA-CR-10038'