Combine current PR's into one

Trying to clean up the PR queue.

Used `merge --no-ff` to maintain history.  Happy to rebase / squash / cherry-pick as needed, but wanted to default to not stealing credit for others work :-)