fix progress bar
Merge branch 'fix-progress-bar' into develop