Revert "Revert "refs #33279""
Merge pull request #497 from aipocom/revert-490-revert-472-features/zero-guide-activity

Revert "Revert "refs #33279""