📰 Custom Issue

As captured in this to-do list here: #6168 (comment), the work in #6168 could be refactored to have some of the code in a more sensible/tidy location.