Resolve Issue #5822
Merge pull request #5823 from quantumsummers/develop

Resolve Issue #5822