Merge pull request #2499 from alexrp/signal-sa-restart