Audit mode rebase

Rebase audit mode onto master.