Merge pull request #6455 from lengly/patch-1