Fixes #9288

[SVN r86475]
Fixes #9285

[SVN r86476]