Changes to conversation classes
Merge origin/master