Pre-v8.0 merge to master

Merge changes associated with v8.0 from devel to master.

Merge request reports

Loading