Backport of gh-10425

Comment From: sjohnr

Closed via 00fafd878cad4c3f8741aecb6d6603de4e30c5c4

Comment From: sjohnr

Removing backport issue from milestone in favor of original issue.