- fix auto-height
Merge branch 'develop'