Merge pull request #5143 from msylgj/patch-1