Merging bugfix-6 branch back into master

Closing off bugfix-6 branch.

New branch model will be created.

Merge request reports

Loading