Sync with Develop branch for bug fix of crop and LCZ #52

Closed cenlinhe closed 2 years ago