closes #9409
closes #9411