Backport master changes to dev

Merge request reports