(cherry picked from commit fd789343b587da252461d84bafba2d72651a11df) Closes #9296
Closes #8502 (cherry picked from commit 62b948b24c4b9c572db225cb19985444d3d80c0f)