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