Further work to be done:
enabled an automatic merge when the pipeline for af46f00f succeeds
merged
mentioned in commit 50d8d9a6