Merge branch 'sg/overlong-progress-fix'