Merge branch 'nd/fetch-status-alignment'