Merge pull request #3676 from chamons/SignalHandlerAPI_XM45