Resolved work item

Related Work Items: #1