Merge branch 'jr/status'