Also add corresponding tests
enabled an automatic merge when the pipeline for 5b9486dc succeeds
merged
mentioned in commit 0f70cfb8