cleanup
NPE on invalid expressions
Merge remote-tracking branch 'origin/master'
Gradle: respect IdeaNameDeduper work from Tooling API