Merge branch 'IDEA-162949' of https://github.com/zdary/intellij-community