Merge branch 'main' into lszomoru/workspace-trust-loose-file