Some extra machinery to support the new conversation lifecycle.
Merge branch 'develop' into develop-frontend