diff --git a/BC.HelperFunctions.ps1 b/BC.HelperFunctions.ps1
index e787fea39..bd7e4ce2d 100644
--- a/BC.HelperFunctions.ps1
+++ b/BC.HelperFunctions.ps1
@@ -19,6 +19,7 @@ function Get-ContainerHelperConfig {
             "useWinRmSession" = "allow"   # allow, always, never
             "addTryCatchToScriptBlock" = $true
             "killPsSessionProcess" = $false
+            "usePrereleaseAlTool" = $true
             "useVolumes" = $false
             "useVolumeForMyFolder" = $false
             "use7zipIfAvailable" = $true
diff --git a/Common/Download-File.ps1 b/Common/Download-File.ps1
index fc4ca6022..cfe9c91f6 100644
--- a/Common/Download-File.ps1
+++ b/Common/Download-File.ps1
@@ -73,6 +73,7 @@ function Download-File {
         if ($bcContainerHelperConfig.DoNotUseCdnForArtifacts -or $sourceUrl -like 'https://bcinsider*.net/*') {
             # Do not use CDN when configured or bcinsider
             $sourceUrl = ReplaceCDN -sourceUrl $sourceUrl -useBlobUrl
+            $timeout += $timeout
         }
         try {
             DownloadFileLow -sourceUrl (ReplaceCDN -sourceUrl $sourceUrl) -destinationFile $destinationFile -dontOverwrite:$dontOverwrite -timeout $timeout -headers $headers
diff --git a/ContainerHandling/Invoke-ScriptInNavContainer.ps1 b/ContainerHandling/Invoke-ScriptInNavContainer.ps1
index 2f90c489a..b234b8bc0 100644
--- a/ContainerHandling/Invoke-ScriptInNavContainer.ps1
+++ b/ContainerHandling/Invoke-ScriptInNavContainer.ps1
@@ -73,6 +73,7 @@ function Invoke-ScriptInBcContainer {
                $isOutOfMemory = Invoke-Command -Session $session -ScriptBlock { Param($containerName, $startTime)
                     $cimInstance = Get-CIMInstance Win32_OperatingSystem
                     Write-Host "`nContainer Free Physical Memory: $(($cimInstance.FreePhysicalMemory/1024/1024).ToString('F1',[CultureInfo]::InvariantCulture))Gb"
+                    Get-PSDrive C | ForEach-Object { Write-Host "Disk C: Free $([Math]::Round($_.Free / 1GB))Gb from $([Math]::Round(($_.Free+$_.Used) / 1GB))Gb" }
                     $any = $false
                     Write-Host "`nServices in container $($containerName):"
                     Get-Service |
@@ -235,6 +236,7 @@ if ($exception) {
        $isOutOfMemory = Invoke-Command -ScriptBlock { Param($containerName, $startTime)
             $cimInstance = Get-CIMInstance Win32_OperatingSystem
             Write-Host "Container Free Physical Memory: $(($cimInstance.FreePhysicalMemory/1024/1024).ToString('F1',[CultureInfo]::InvariantCulture))Gb"
+            Get-PSDrive C | ForEach-Object { Write-Host "Disk C: Free $([Math]::Round($_.Free / 1GB))Gb from $([Math]::Round(($_.Free+$_.Used) / 1GB))Gb" }
             $any = $false
             Write-Host "`nServices in container $($containerName):"
             Get-Service |
diff --git a/HelperFunctions.ps1 b/HelperFunctions.ps1
index 02542d860..bbe5de7d6 100644
--- a/HelperFunctions.ps1
+++ b/HelperFunctions.ps1
@@ -1228,9 +1228,10 @@ function DownloadLatestAlLanguageExtension {
 
 function RunAlTool {
     Param(
-        [string[]] $arguments
+        [string[]] $arguments,
+        [switch] $usePrereleaseAlTool = ($bccontainerHelperConfig.usePrereleaseAlTool)
     )
-    $path = DownloadLatestAlLanguageExtension
+    $path = DownloadLatestAlLanguageExtension -allowPrerelease:$usePrereleaseAlTool
     if ($isLinux) {
         $alToolExe = Join-Path $path 'extension/bin/linux/altool'
         Write-Host "Setting execute permissions on altool"
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 4021b0acf..773ffddc3 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,3 +1,7 @@
+6.0.18
+Use altool from prerelease AL Language extension
+Display disk free inside container on error
+
 6.0.17
 Issue 3518 If WinRm is not running on the host, a container couldn't be created
 Issue 3519 New-BcContainer fails due to password complexity on some computers
diff --git a/Version.txt b/Version.txt
index d45b0b95c..5e2167db7 100644
--- a/Version.txt
+++ b/Version.txt
@@ -1 +1 @@
-6.0.17-dev
+6.0.18-dev