What does this implement/fix? Explain your changes.

#1831

Does this close any currently open issues?

#1831 #1832

Any other comments?

Supercedes #1832.

Checklist

Check all those that are applicable and complete.

• Make sure to include one or more tests for your change
• If an enhancement PR, please create docs and at best an example
• Ensure you have signed the .NET Foundation CLA
• Add yourself to AUTHORS
• Updated the CHANGELOG

Yes, it does; this was the original form of my patch :) . Apologies for the lateness, it was a long weekend over here.