This should fix the last part of #11006
Thanks Diego for the nice PR including the tests!
We will review for inclusion in 3.0.5 release. We hope you will keep submitting such quality Pull requests :sunglasses:
@mattab It's a fun project to contribute to! Thanks for the feedback!
Hi @diegobanos, do you think you'll have time to finish this PR?