Merge changes I61392c55,I97e40d35 into sc-dev

* changes:
  Expand internal stop reasons.
  Rename "legacy" stop reasons.