Merge branch 'PY-15074' of git.labs.intellij.net:idea/community into PY-15074