Merge branch 'chat-relation-constraints' into 'develop'