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