Could do with a lot of improvement, but moving in right direction
enabled an automatic merge when the pipeline for 239bf6c2 succeeds
merged
mentioned in commit 14750490