Can we split these out into Yet Another Patch? (Sorry! :cake:)