[GIT PULL] Audit patches for v4.21