diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml
index 1a6ca02fd2..d95949d865 100644
--- a/build/azure-pipelines.yml
+++ b/build/azure-pipelines.yml
@@ -25,7 +25,8 @@ stages:
                 vmImage: windows-latest
             steps:
                 - task: PowerShell@1
-                  displayName: Set $isRelease variable
+                  name: setReleaseVariable
+                  displayName: Set isRelease variable
                   inputs:
                       scriptType: inlineScript
                       inlineScript: >
@@ -33,9 +34,9 @@ stages:
 
                           if ($isRelease.Count -gt 0){
                              Write-Host "##vso[build.addbuildtag]Release build"
-                             Write-Host "##vso[task.setvariable variable=isRelease]true"
+                             Write-Host "##vso[task.setvariable variable=isRelease;isOutput=true]true"
                           }else{
-                             Write-Host "##vso[task.setvariable variable=isRelease]false"
+                             Write-Host "##vso[task.setvariable variable=isRelease;isOutput=true]false"
                           }
     - stage: Unit_Tests
       displayName: Unit Tests
@@ -356,6 +357,7 @@ stages:
 
                         $version = $ubuild.GetUmbracoVersion()
 
+                        $isRelease = [regex]::matches($env:BUILD_SOURCEBRANCH,"v\d+\/\d+.\d+.*")
 
                         if ($isRelease.Count -gt 0){
                           $continuous = $version.Semver
@@ -476,11 +478,11 @@ stages:
     - stage: Artifacts_Docs
       displayName: 'Static Code Documentation'
       dependsOn: [Determine_build_type]
-      condition: 'eq(variables.IsRelease, true)'
       jobs:
           - job: Generate_Docs_CSharp
             timeoutInMinutes: 60
             displayName: Generate C# Docs
+            condition: eq(stageDependencies.Determine_build_type.Set_build_variables.outputs['setReleaseVariable.isRelease'], 'true')
             pool:
                 vmImage: windows-latest
             steps:
@@ -521,10 +523,10 @@ stages:
                       targetPath: $(Build.ArtifactStagingDirectory)\docs\csharp-docs.zip
                       artifact: docs-cs
                       publishLocation: pipeline
-
           - job: Generate_Docs_JS
             timeoutInMinutes: 60
             displayName: Generate JS Docs
+            condition: eq(stageDependencies.Determine_build_type.Set_build_variables.outputs['setReleaseVariable.isRelease'], 'true')
             pool:
                 vmImage: windows-latest
             steps:
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index a1220f9b3f..431bd07fd3 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Version>9.0.0</Version>
     <AssemblyVersion>9.0.0</AssemblyVersion>
-    <InformationalVersion>9.0.0-beta004</InformationalVersion>
+    <InformationalVersion>9.0.0-rc001.pre001</InformationalVersion>
     <FileVersion>9.0.0</FileVersion>
     <LangVersion Condition="'$(LangVersion)' == ''">9.0</LangVersion>
     <NeutralLanguage>en-US</NeutralLanguage>
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/MediaPickerWithCropsValueConverter.cs b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/MediaPickerWithCropsValueConverter.cs
index 0aa6fca5a9..51bf3c477c 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/MediaPickerWithCropsValueConverter.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/MediaPickerWithCropsValueConverter.cs
@@ -15,15 +15,18 @@ namespace Umbraco.Cms.Core.PropertyEditors.ValueConverters
     {
         private readonly IPublishedSnapshotAccessor _publishedSnapshotAccessor;
         private readonly IPublishedUrlProvider _publishedUrlProvider;
+        private readonly IPublishedValueFallback _publishedValueFallback;
         private readonly IJsonSerializer _jsonSerializer;
 
         public MediaPickerWithCropsValueConverter(
             IPublishedSnapshotAccessor publishedSnapshotAccessor,
             IPublishedUrlProvider publishedUrlProvider,
+            IPublishedValueFallback publishedValueFallback,
             IJsonSerializer jsonSerializer)
         {
             _publishedSnapshotAccessor = publishedSnapshotAccessor ?? throw new ArgumentNullException(nameof(publishedSnapshotAccessor));
             _publishedUrlProvider = publishedUrlProvider;
+            _publishedValueFallback = publishedValueFallback;
             _jsonSerializer = jsonSerializer;
         }
 
@@ -77,7 +80,7 @@ namespace Umbraco.Cms.Core.PropertyEditors.ValueConverters
 
                     // TODO: This should be optimized/cached, as calling Activator.CreateInstance is slow
                     var mediaWithCropsType = typeof(MediaWithCrops<>).MakeGenericType(mediaItem.GetType());
-                    var mediaWithCrops = (MediaWithCrops)Activator.CreateInstance(mediaWithCropsType, mediaItem, localCrops);
+                    var mediaWithCrops = (MediaWithCrops)Activator.CreateInstance(mediaWithCropsType, mediaItem, _publishedValueFallback, localCrops);
 
                     mediaItems.Add(mediaWithCrops);
 
diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
index 0b345753d0..9ebbc7b562 100644
--- a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
+++ b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
@@ -5,63 +5,62 @@
     <RootNamespace>Umbraco.Cms.Web.UI.NetCore</RootNamespace>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <DocumentationFile>bin\Release\Umbraco.Web.UI.NetCore.xml</DocumentationFile>
+    <DocumentationFile>bin/Release/Umbraco.Web.UI.NetCore.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup>
     <CopyRazorGenerateFilesToPublishDirectory>true</CopyRazorGenerateFilesToPublishDirectory>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Umbraco.PublishedCache.NuCache\Umbraco.PublishedCache.NuCache.csproj" />
-    <ProjectReference Include="..\Umbraco.Web.BackOffice\Umbraco.Web.BackOffice.csproj" />
-    <ProjectReference Include="..\Umbraco.Web.Common\Umbraco.Web.Common.csproj" />
-    <ProjectReference Include="..\Umbraco.Web.Website\Umbraco.Web.Website.csproj" />
-    <ProjectReference Include="..\Umbraco.Persistence.SqlCe\Umbraco.Persistence.SqlCe.csproj" Condition="'$(OS)' == 'Windows_NT'" />
+    <ProjectReference Include="../Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj" />
+    <ProjectReference Include="../Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj" />
+    <ProjectReference Include="../Umbraco.Web.Common/Umbraco.Web.Common.csproj" />
+    <ProjectReference Include="../Umbraco.Web.Website/Umbraco.Web.Website.csproj" />
+    <ProjectReference Include="../Umbraco.Persistence.SqlCe/Umbraco.Persistence.SqlCe.csproj" Condition="'$(OS)' == 'Windows_NT'" />
   </ItemGroup>
 
   <ItemGroup>
     <Folder Include="App_Plugins" />
     <Folder Include="Views" />
-    <Folder Include="wwwroot\Media" />
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Remove="umbraco\Data\**" />
-    <Compile Remove="umbraco\logs\**" />
-    <Compile Remove="umbraco\mediacache\**" />
-    <Compile Remove="wwwroot\umbraco\**" />
-    <Compile Remove="App_Data\**" />
+    <Compile Remove="umbraco/Data/**" />
+    <Compile Remove="umbraco/logs/**" />
+    <Compile Remove="umbraco/mediacache/**" />
+    <Compile Remove="wwwroot/umbraco/**" />
+    <Compile Remove="App_Data/**" />
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Remove="App_Data\**" />
-    <EmbeddedResource Remove="umbraco\Data\**" />
-    <EmbeddedResource Remove="umbraco\logs\**" />
-    <EmbeddedResource Remove="umbraco\mediacache\**" />
+    <EmbeddedResource Remove="App_Data/**" />
+    <EmbeddedResource Remove="umbraco/Data/**" />
+    <EmbeddedResource Remove="umbraco/logs/**" />
+    <EmbeddedResource Remove="umbraco/mediacache/**" />
   </ItemGroup>
 
   <ItemGroup>
-    <Content Remove="App_Data\**" />
-    <Content Remove="umbraco\Data\**" />
-    <Content Remove="umbraco\logs\**" />
-    <Content Remove="umbraco\mediacache\**" />
-    <Content Remove="wwwroot\Web.config" />
+    <Content Remove="App_Data/**" />
+    <Content Remove="umbraco/Data/**" />
+    <Content Remove="umbraco/logs/**" />
+    <Content Remove="umbraco/mediacache/**" />
+    <Content Remove="wwwroot/Web.config" />
   </ItemGroup>
 
 
   <ItemGroup>
-    <None Include="config\**\*.*">
+    <None Include="config/**/*.*">
       <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
       <CopyToPublishDirectory>Always</CopyToPublishDirectory>
     </None>
-    <None Include="umbraco\**\*.*">
+    <None Include="umbraco/**/*.*">
       <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
       <CopyToPublishDirectory>Always</CopyToPublishDirectory>
     </None>
-    <None Remove="App_Data\**" />
-    <None Remove="umbraco\Data\**" />
-    <None Remove="umbraco\logs\**" />
-    <None Remove="umbraco\mediacache\**" />
-    <None Include="umbraco\UmbracoWebsite\NoNodes.cshtml" />
+    <None Remove="App_Data/**" />
+    <None Remove="umbraco/Data/**" />
+    <None Remove="umbraco/logs/**" />
+    <None Remove="umbraco/mediacache/**" />
+    <None Include="umbraco/UmbracoWebsite/NoNodes.cshtml" />
   </ItemGroup>
 
   <!-- We don't want to include the generated files, they will throw a lot of errors -->
@@ -83,8 +82,8 @@
   </PropertyGroup>
   
   <PropertyGroup>
-    <BellePath>$(ProjectDir)wwwroot\umbraco</BellePath>
-    <JsonSchemaPath>$(ProjectDir)umbraco\config\appsettings-schema.json</JsonSchemaPath>
+    <BellePath>$(ProjectDir)wwwroot/umbraco</BellePath>
+    <JsonSchemaPath>$(ProjectDir)umbraco/config/appsettings-schema.json</JsonSchemaPath>
   </PropertyGroup>
   <Target Name="CheckPreconditions" BeforeTargets="Build">
     <Message Text="-CheckPreconditions-" Importance="high" />
@@ -103,10 +102,10 @@
     <CallTarget Targets="JsonSchemaBuild" Condition="!Exists('$(JsonSchemaPath)') and '$(UmbracoBuild)' == ''" />
   </Target>
   <Target Name="BelleBuild">
-    <Exec WorkingDirectory="$(ProjectDir)\..\..\" Command="powershell -ExecutionPolicy RemoteSigned -Command &quot;&amp;{ $ubuild = &amp;&quot;$pwd\build\build.ps1&quot; -get ; $ubuild.CompileBelle() }&quot;" />
+<!--    <Exec WorkingDirectory="$(ProjectDir)/../../src/Umbraco.Web.UI.Client/" Command="powershell -ExecutionPolicy RemoteSigned -Command '&amp;{ npm install ; npm run build }'" />-->
   </Target>
   <Target Name="JsonSchemaBuild">
-    <Exec WorkingDirectory="$(ProjectDir)\..\..\" Command="powershell -ExecutionPolicy RemoteSigned -Command &quot;&amp;dotnet run --project $pwd\src\JsonSchema\JsonSchema.csproj -c Release -- --outputFile $pwd\src\Umbraco.Web.UI.NetCore\$(JsonSchemaPath) &quot;" />
+<!--    <Exec WorkingDirectory="$(ProjectDir)/../../" Command="powershell -ExecutionPolicy RemoteSigned -Command '&amp;dotnet run &#45;&#45;project $pwd/src/JsonSchema/JsonSchema.csproj -c Release &#45;&#45; &#45;&#45;outputFile $pwd/src/Umbraco.Web.UI.NetCore/$(JsonSchemaPath)'" />-->
   </Target>
   
   <!-- clean Belle when cleaning and rebuilding, but only in Visual Studio -->