Merge branch 'conversation-update-on-dm-delete' into 'develop'