Merge branch 'progress-as-hook2'