Merge "Update the anomaly type constants" into pi-dev