Merge branch 'sg/progress-fix'