Merged 'dev'.
updated tests
Merge remote-tracking branch 'origin/feature-e2e-tests-conversation' into feature-e2e-tests-conversation