#4137 AuditManager rework