@clemenci @cattanem note that I'm not changing run2-patches since there seem to be issues with the build there.