Merge branch 'nd/status-partial-refresh'