Merge branch 'bauermar-master-patch-71753' into 'master'

Bauermar master patch 71753

See merge request !11
2 jobs for master
in 7 seconds, using 0 compute credits, and was queued for 3 seconds