Possible solution for duplicate status entries
Merge branch 'james_branch_2' into dev