Closes #7421