Sync with develop branch update for glacier bug fix #43

Closed cenlinhe closed 2 years ago