Merge branch 'fix/relationships-in-statuses' into 'develop'