enchancements to reporting: AUTO-563/AUTO-567