Audit validation fix, CORE-443, CORE-434
Merge pull request #2096 from reciprocity/feature/audit-validation-fix-CORE-443

Audit validation fix, CORE-443, CORE-434