Add chat gherkins
Merge branch 'chat-gherkin'