Closes #9095