Refine what stop-signal does depending on its value
Merge branch 'stop-signal-revised'