WIP: Resolve "Sanity Checks for 1.6.0-beta2"

Francis Dupont requested to merge 746-sanity-checks-for-1-6-0-beta2 into master

Closes #746 (closed)

Merge request reports