Closes #8148