Closes #611 (closed), #612 (closed)
enabled an automatic merge when the pipeline for 2cc23c11 succeeds
merged
mentioned in commit 3ad4baec