(cherry picked from commit 1299a97579bec52ee3d16ab8d05c9e22edd80330) Closes #10248
(cherry picked from commit cae134ec7b331d1c906343716472f3d043614b2c) Closes #9998