[USER STORY 341247](https://dev.azure.com/msft-skilling/Content/_workitems/edit/341247) [USER STORY 340177](https://dev.azure.com/msft-skilling/Content/_workitems/edit/340177/?view=edit) --- [Associated WorkItem - 341263](https://dev.azure.com/msft-skilling/Content/_workitems/edit/341263)
