^ the work in #5616 and #5639 is getting too complex to keep in PRs so the new branch will be temporary and allow smaller PRs against it