Merge branch '1866-last-status-stuff' into 'develop'