Merge Nalanda RCT2 and Release-0.12.0 into Develop

Bring develop in line with all latest features and bug fixes from other branches. Hold off merging until review and merge of #2274.