Sync with develop branch for bug fix #107

Closed cenlinhe closed 10 months ago