Sync with develop branch for bug fix of gecros and urban #45

Closed cenlinhe closed 2 years ago