Co-Authored-By: Nicholas Penree <[email protected]> (cherry picked from commit ee469d5ac3f72cc8e010728cc7c6273c711875b0)