Backport gh-11264

Comment From: rwinch

FIxed via 51557198773f1ac20603e14f2bc8dcca8969ab3f...e2eed33eca21451eadf23aeeeea31a9ede4dbeb5