Merge into master.
enabled an automatic merge when the pipeline for 933a4713 succeeds
merged
mentioned in commit 1601f46e