Closes #9185