Closes #10265352272514