Sync with Develop branch for bug fix #124

Closed cenlinhe closed 7 months ago