Merge changes from upstream master

Merge request reports

Loading