Merge "Fix a STOPSHIP" into lmp-dev