(cherry picked from commit c81ae6546118e954e481894d0b3fa6e9a20359c7) Closes #9961
(cherry picked from commit 6d552f2a60f44052079b5e8944f5e1bbabac56e0) Closes #9837