Closes #6949.