Merge branch 'v9/contrib' into v9/dev

# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs

.vscode/launch.json

@@ -14,6 +14,7 @@
             "args": [],
             "cwd": "${workspaceFolder}/src/Umbraco.Web.UI",
             "stopAtEntry": false,
+            "requireExactSource": false,
             // Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser
             "serverReadyAction": {
                 "action": "openExternally",