[GIT PULL] Audit fixes for 4.7 (#1)