### Description Work on providing a unified approach for: - [ ] #1085 - [ ] #1450
Description
Work on providing a unified approach for: