Changes to conversation classes
Merge origin/master
Changes to conversation classes