Merge branch 'jk/signal-cleanup'