Merge devel into master

Merged Ciarán Ó Rourke requested to merge devel into master

Merge request reports