Merge branch 'bug/JAL-1734_misleading-progress-bar' into develop