Merge branch 'chores/remove-ostatus-fixtures' into 'develop'