Merge branch 'develop' into release/candidate

* develop:
  Fixbug on auto collapse
Merge branch 'develop' into release/candidate
Merge branch 'release/candidate' into develop