Hey @bruno- I'm creating another PR as you asked. Can you check to see if this one is alright?