[GIT PULL] Audit fixes for v4.11 (#2)