Merge pull request #2314 from henghonglee/issue-2292