WELD-1787 Preparation work

This is not going to be merged anytime soon. Just using CI to test for regressions :-)