Merge branch 'sg/progress-off-by-one-fix'