It might be slightly confusing that a couple of the changes will be twice in the history, but let's merge this way.
apply