Merge master into audit-mode

There's more audit mode work to do, but this helps catch up the branch with master. @tyler-ball