Merge "Add comments and additional constants for the known bad anomaly types." into pi-dev