Allow overriding already defined responses
Merge remote-tracking branch 'origin/refactor-code-generation' into overridable-responses
Refactor code generation