Closes #8235.