Cherry-pick from hifis/software.hifis.net!287 (merged)
enabled an automatic merge when the pipeline for 1a857117 succeeds
merged
mentioned in commit 5c9c5761