Merge branch 'jc/simplify-progress'