Closes #6631