Merge pull request #7347 from JeroenED/task/relationship-status