Merge branch 'nd/status-show-in-progress'