Merge branch 'nd/status-long' into next