Merge branch 'ar/progress'