[GIT PULL] Audit fixes for 3.18