[GIT PULL] Audit fixes for v4.8