Merge branch 'user-info-unread-direct-conversation' into 'develop'