Merge pull request #9702 from Eun/patch-1