Merge "Add STOPSHIP comment"