Merge branch 'main' into fix-devtools-production-query-client