Revert "Revert "refs #33277""
Merge pull request #499 from aipocom/revert-488-revert-474-features/zero-guide-cabinet

Revert "Revert "refs #33277""