Closes #9402 Closes #9775 Closes #9887
This reverts commit cbe85a089306b102c8259e793d689af8e381773e.
Closes #9402 Closes #9775