Merge branch 'main' into feat-embedded-chat