Merge v1.2 branch into master

Mostly clean, except for relaxed scans in ORCA which required a few changes.