Merge "Remove STOPSHIP" into nyc-dev