Backport of gh-9912

Comment From: sjohnr

Closed via ee9c8e2fd0f0345b5f130663138a396b98cd9418 (and b6ae11295fcc4527ddb3c2c8d312ca437925c985)