Merge pull request #9690 from tomoaki0705:universalSmooth