I think it makes sense that I first pull the changes made by @twall so I can run the tests locally on my own.
As I am away for two days, this will need a while.
Just to let you know that this PR will need to stay open for some more days before you can go on.