Merge branch 'bartels-master-patch-31355' into 'master'

Bartels master patch 31355

See merge request !3
6 jobs for master in 7 minutes and 36 seconds (queued for 1 second)
latest
Status Job ID Name Coverage
  Package
passed #5016
docker-runner
alpine-bash

00:00:51

passed #5018
docker-runner
alpine-sh

00:00:47

passed #5017
docker-runner
alpine-zsh

00:00:55

passed #5019
docker-runner
ubuntu-bash

00:01:59

passed #5021
docker-runner
ubuntu-sh

00:01:28

passed #5020
docker-runner
ubuntu-zsh

00:01:34