Hey! I submitted a PR #6328 for issue #6322. Just a gentle ping in case it got missed. Happy to make any changes! 🙂