Merge pull request #5852 from y04/master