Simplify data integrity validator implementation + additional logging (OMS-467)