Merge "Remove (old) STOPSHIP" into qt-dev