added test for cancel generation
Merge remote-tracking branch 'origin/feature-conversation-settings-renew' into feature-conversation-settings-renew
Merge remote-tracking branch 'origin/feature-conversation-settings-renew' into feature-conversation-settings-renew
Merge remote-tracking branch 'origin/feature-conversation-settings-renew' into feature-conversation-settings-renew