[GIT PULL] Audit fixes for v6.0 (#2)