I think it should be OK. However, I did not manage to make the big PRs completely independent of each other. So I will probably have to rebase them once this is committed.