@Victor Rezende dos Santos: Victor, this is a follow-up to HV-809. Would you be interested in providing a pull request for this?