Merge branch 'main' into ci/add-sanity-check-for-ext-output