[GIT PULL] Audit fixes for v5.17 (#2)