Merge branch 'master-global-modifications' into 'master'

Open Sebastian Kennedy requested to merge cherry-pick-c385963a into test_jenkins

Master global modifications

See merge request !1 (merged)

Merge request reports