Comment by rswail

Sort of squash and rebase before a merge back to main?