Add stop option guide in text message
Fix conflicts after merging MH-977 to dev