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