Closes issue #9095

This commit resolves issue #9095.