Merge "Remove the STOPSHIP. This is tracked in a bug"