Merge pull request #5667 from kidonng/patch-1