Merge branch 'main' into fix/vue-query-environment-manager