Merge "Use FIELD_ANOMALY_TYPE instead of FIELD_CONTEXT"