[GIT PULL] Audit fixes for v4.13 (#2)