Merge changes from Branch 4.0.0 to master

Master should be kept up to date with changes in the version branch branch-4.0.0

Merge request reports

Loading