Merge "Fix veridex reporting"