Merge branch 'np/progress'