Commit 96482484 by Jonathan Thomas

Merge branch 'develop' into improved-chat-prompt

# Conflicts:
#	CHANGELOG.md
parents 12c71217 0c75b901
Pipeline #13346 passed with stages
in 2 minutes 22 seconds