What does this implement/fix? Explain your changes.

Fixes #1724, supersedes #1798.

Does this close any currently open issues?

...

Any other comments?

...

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