Merge branch 'east825/IDEA-136499'