Merge pull request #1733 from kodustech/fix/rc-e2e-harness-failures