Merge branch 'dev'
fix resume ui bug