(cherry picked from commit ae7b187e412a080e30fc6826564ce9197ed2f329) Closes #10347
(cherry picked from commit 76650af9fdc7ef06d13ce252986d21574903d293) Closes #10231