Closes #9855.
Closes #9878.