Fixed #9208

[SVN r86207]
Fixed #9258

[SVN r86353]