(cherry picked from commit 12a1ef038753cdab89ae7137d06e1ba3810166b1)
(cherry picked from commit ee80564dd427ca1dc14c192955efaa61f386ad44) Closes #10229