Bugfix - ZSS Matadata API

Proposed changes

This PR addresses the regression where ZSS hangs on the metadata call

This PR depends upon the following PRs:

Please delete options that are not relevant.

[x] Bug fix (non-breaking change which fixes an issue)
[ ] New feature (non-breaking change which adds functionality)
[ ] Change in a documentation
[x] Refactor the code
[ ] Chore, repository cleanup, updates the dependencies.
[ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)

Please delete options that are not relevant.

[ ] If the changes in this PR are meant for the next release / mainline, this PR targets the "staging" branch.
[ ] My code follows the style guidelines of this project (see: Contributing guideline)
[ ] I have commented my code, particularly in hard-to-understand areas
[ ] I have made corresponding changes to the documentation
[ ] New and existing unit tests pass locally with my changes
[ ] video or image is included if visual changes are made
[ ] Relevant update to CHANGELOG.md
[ ] My changes generate no new warnings
[ ] I have added tests that prove my fix is effective or that my feature works, or describe a test method below