Merge "Remove a stopship" into rvc-dev