Merge pull request #9288 from reyyed/issue#9063fix