I encountered various errors during testing for #3320. They are now fixed and will come in on PRs soon.