Try to fix issues with progress.json not being updated
Merge branch 'upstream'
Merge branch 'upstream'
Merge branch 'upstream'