(cherry picked from commit 1df0ba9e5aef2d2745a45c546c869837ac8e68db)
(cherry picked from commit 824ed0a36931ce7aae9aa544a7baf0738dae568c) Closes #10230 Closes #10390 Closes #10247