This works around #542 (closed) until we find a fix.
assigned to @nik
enabled an automatic merge when the pipeline for 07d7decb succeeds
merged
mentioned in commit 1ea5ba94