I'm about to PR for my follow up, but I think now that it deserves a different JIRA so I'll mark this one resolved. Follow up is HHH-9003