BigW Consortium Gitlab
- Makes the MR easier to read; this can go in a separate MR - This is a (sort of) revert of 99bea01