Merge branch 'docs/direct_conversation_id' into 'develop'