Progress displayed
Merge branch 'progress' into development