Merge pull request #2222 from chang-zhao/patch-4