Finish conversation-controls
Merged 'dev'.