Merge branch 'feature/issue-473-rename-conversation-states' into develop-frontend