Merge branch 'nd/status-long'