Looks good and thank you for providing your changes as a reference. This will be a big help to the team when they get around to this task.
I’ll try to remember to inform you once you’ve formally added this feature from our side. For the meantime feel free to use your patched version of TorizonCore Builder for your use case here.
Best Regards,
Jeremias