Merge pull request #1664 from kodustech/fix/e2e-matrix-signal