Thanks. Would you mind rebasing this change on top of 3.7.x branch so that we can include the fixes into the current released version and not just the future release (main)?

@chemicL
Sure, that's possible! Just to confirm, should I create a new PR with the changes rebased onto the 3.7.x branch?

You could just use git rebase --onto, force push to your branch and change the base of this PR.

Thank you for your guidance.
As per your instructions, I performed the rebase and force push.
Could you please check if everything is correct?

Thank you for the contribution! 🚀