Merge branch 'jc/status'