 Related work items: #7975