Merge pull request #1706 from kodustech/fix/e2e-clear-free-tenant-byok