Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Remove one of the object
Replace the use of the deleted by the other
Merge branch 'join-two-equals-object-to-awake-users-in-one' into develop