Merge branch 'main' into test/query-core-exact-assertions