Merge pull request #4713 from myungjoo/fix/4712