Merge "Add constants for reporting criteria" into pi-dev