Merge "Add constants for reporting criteria"