A bunch of trunk build patches coming