Update simplification for simple Segment field changes
Merge branch 'segment-fields' into stage

* segment-fields:
  Update simplification for simple Segment field changes