Merge branch 'fix-tap-signal-test'