Master global modifications

Merged Sebastian Kennedy requested to merge master-global-modifications into master

Merge request reports