Merge branch 'jk/progress-delay-fix'