Merge branch 'refactor/db-not-null-constraints-for-conversation_participations' into...