Merge branch 'frenner-master-patch-80447' into 'master'

Remove overlap of plotlabel with unit

See merge request !288
31 jobs for !288 with frenner-master-patch-80447 into master in 11 minutes and 30 seconds (queued for 3 seconds)