Merge branch 'main' into channel-guests