Merge branch 'main' into fix/devtools-missing-query-state