Merge pull request #2347 from henghonglee/issue-2304