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