Merge branch 'jk/test-match-signal' into maint