Hello,
I have sent a revised patch to #61906 which has been altered per suggestion.
Please let me know if any further changes are needed.