Fix progress bar
Change to v2.1.6
Merge branch 'fix-progressbar' into develop