Merge branch 'main' into repo-clone-pull-gated-discovery