Merge pull request #23901 from M95D/m95d-audit2