Merge pull request #9621 from venth/feature/ignored_intellij