Merge pull request #23441 from nullaus/bug1058722

bug 1058722 - Add ability to filter stack when invoking the task manager...
(cherry picked from commit 472804d7de2797e87fb4cceb32d51aa1cfc10d6f)
Merge pull request #23654 from nullaus/v2.1

Merge pull request #23441 from nullaus/bug1058722