diff --git a/arduino-core/src/cc/arduino/Compiler.java b/arduino-core/src/cc/arduino/Compiler.java
index 858bd1586d4..fcc85083622 100644
--- a/arduino-core/src/cc/arduino/Compiler.java
+++ b/arduino-core/src/cc/arduino/Compiler.java
@@ -202,6 +202,13 @@ private void callArduinoBuilder(TargetBoard board, TargetPlatform platform, Targ
}
});
+ commandLine.addArgument("-package-index", false);
+ commandLine.addArgument("\"" + BaseNoGui.getSettingsFolder() + "\"", false);
+
+ commandLine.addArgument("-prefs", false);
+ commandLine.addArgument("\"" + Constants.PREF_BOARDS_MANAGER_ADDITIONAL_URLS + "=" +
+ "package_index.json," + PreferencesData.get(Constants.PREF_BOARDS_MANAGER_ADDITIONAL_URLS, "") + "\"", false);
+
Stream.of(BaseNoGui.getContentFile("tools-builder").getAbsolutePath(), Paths.get(BaseNoGui.getHardwarePath(), "tools", "avr").toAbsolutePath().toString(), new File(BaseNoGui.getSettingsFolder(), "packages").getAbsolutePath())
.forEach(p -> {
if (Files.exists(Paths.get(p))) {
diff --git a/build/arduino-builder-arm-1.3.19.tar.bz2.sha b/build/arduino-builder-arm-1.3.20-json.tar.bz2.sha
similarity index 100%
rename from build/arduino-builder-arm-1.3.19.tar.bz2.sha
rename to build/arduino-builder-arm-1.3.20-json.tar.bz2.sha
diff --git a/build/arduino-builder-linux32-1.3.19.tar.bz2.sha b/build/arduino-builder-linux32-1.3.19.tar.bz2.sha
deleted file mode 100644
index a22d594e6e3..00000000000
--- a/build/arduino-builder-linux32-1.3.19.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-c2d8c712d908b370314a98cebe9bbf2ec621f5c6
diff --git a/build/arduino-builder-linux32-1.3.20-json.tar.bz2.sha b/build/arduino-builder-linux32-1.3.20-json.tar.bz2.sha
new file mode 100644
index 00000000000..27817b18f65
--- /dev/null
+++ b/build/arduino-builder-linux32-1.3.20-json.tar.bz2.sha
@@ -0,0 +1 @@
+953cf49dc9becd21236187345d47f023975bb6b0
diff --git a/build/arduino-builder-linux64-1.3.19.tar.bz2.sha b/build/arduino-builder-linux64-1.3.19.tar.bz2.sha
deleted file mode 100644
index 24b63fadb08..00000000000
--- a/build/arduino-builder-linux64-1.3.19.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-66bb29b2ddcf1bc3896e2ccfa396353ea6735cc7
diff --git a/build/arduino-builder-linux64-1.3.20-json.tar.bz2.sha b/build/arduino-builder-linux64-1.3.20-json.tar.bz2.sha
new file mode 100644
index 00000000000..0fb4e8a0f8c
--- /dev/null
+++ b/build/arduino-builder-linux64-1.3.20-json.tar.bz2.sha
@@ -0,0 +1 @@
+ed947f5b0d0be3b6331c5e3d45a0dc52c722bfa6
diff --git a/build/arduino-builder-macosx-1.3.19.tar.bz2.sha b/build/arduino-builder-macosx-1.3.19.tar.bz2.sha
deleted file mode 100644
index 03c5d97c414..00000000000
--- a/build/arduino-builder-macosx-1.3.19.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-f933da93b97b8981298b2e289d8650536b5978d5
diff --git a/build/arduino-builder-macosx-1.3.20-json.tar.bz2.sha b/build/arduino-builder-macosx-1.3.20-json.tar.bz2.sha
new file mode 100644
index 00000000000..3aa0bf95054
--- /dev/null
+++ b/build/arduino-builder-macosx-1.3.20-json.tar.bz2.sha
@@ -0,0 +1 @@
+58fd6795ce3ac05cd2a03d7265a746da1452ac36
diff --git a/build/arduino-builder-windows-1.3.19.zip.sha b/build/arduino-builder-windows-1.3.19.zip.sha
deleted file mode 100644
index 8c7f4f3b167..00000000000
--- a/build/arduino-builder-windows-1.3.19.zip.sha
+++ /dev/null
@@ -1 +0,0 @@
-1cd4a97fba256a4560d4da68cbead738bf4e8312
diff --git a/build/arduino-builder-windows-1.3.20-json.zip.sha b/build/arduino-builder-windows-1.3.20-json.zip.sha
new file mode 100644
index 00000000000..9e9f399e26c
--- /dev/null
+++ b/build/arduino-builder-windows-1.3.20-json.zip.sha
@@ -0,0 +1 @@
+06c060be2e6bdd04814b95541f246e42b8d57259
diff --git a/build/build.xml b/build/build.xml
index 446dadce221..c9c3fb039a0 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -89,7 +89,7 @@
-
+