Issue Being Resolved
Fixes #12345 (exactly like this, so this PR is associated with an issue)
Change overview
What's in this PR