WIP: Sync ST with master

Gerhard Ravenrequested to merge
ST-backport-from-master into run2-patches
  • apply changes accumulated in master to run2-patches
Edited by Gerhard Raven

Merge request reports