Related: #597 Related: #25 Note to self: review the history of this feature. Relates to work in #1405