Messages are conversations once again
Merge branch 'devel' into messages
Update in Changelog