Push fixes to production

Merged Martin Lowe requested to merge master into production

Merge request reports