am e2962681: Merge "Overhaul of intellij-gen script."

* commit 'e2962681b6f73dba3ff2ac7e63a6f70901fc1751':
  Overhaul of intellij-gen script.