Hi @djg_tram,
Attaching a patch, please review.
Thanks!