Merge branch 'nd/status-refresh-progress'