Merge "Overhaul of intellij-gen script."