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