Merge "Remove obsolete stopship comment"