Merge remote-tracking branch 'origin/v9/9.3' into v9/dev

# Conflicts:
#	build/templates/UmbracoPackage/.template.config/template.json
#	build/templates/UmbracoProject/.template.config/template.json

tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Languages/languages.ts

@@ -13,6 +13,7 @@ context('Languages', () => {
       cy.umbracoEnsureLanguageCultureNotExists(culture);
       cy.umbracoSection('settings');
 
+      cy.get('.umb-tree-root-link').contains('Settings')
       // Enter language tree and create new language
       cy.umbracoTreeItem('settings', ['Languages']).click();
       cy.umbracoButtonByLabelKey('languages_addLanguage').click();