handle null matcher.
Merge branch 'master' into develop
handle null matcher.
reliably listen on RESPONSE event to supress shutdown for valid responses.
Merge branch 'master' into develop