Updated JetBrains link as thanks for their support
Fix null refs.
Merge branch '3.2' into 3.5