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