Closes #9555