Merge branches 'evagl/OC-11226' and 'master' of git.labs.intellij.net:idea/community