diff --git a/cli/compile/compile.go b/cli/compile/compile.go
index 0ddaf97232f..40775a72c5e 100644
--- a/cli/compile/compile.go
+++ b/cli/compile/compile.go
@@ -47,7 +47,7 @@ var (
 	port               string   // Upload port, e.g.: COM10 or /dev/ttyACM0.
 	verify             bool     // Upload, verify uploaded binary after the upload.
 	exportFile         string   // The compiled binary is written to this file
-	dryRun             bool     // Use this flag to now write the output file
+	dryRun             bool     // Use this flag to not write the output file
 	libraries          []string // List of custom libraries paths separated by commas. Or can be used multiple times for multiple libraries paths.
 	optimizeForDebug   bool     // Optimize compile output for debug, not for release
 )
@@ -128,13 +128,15 @@ func run(cmd *cobra.Command, args []string) {
 
 	if uploadAfterCompile {
 		_, err := upload.Upload(context.Background(), &rpc.UploadReq{
-			Instance:   inst,
-			Fqbn:       fqbn,
-			SketchPath: sketchPath.String(),
-			Port:       port,
-			Verbose:    verbose,
-			Verify:     verify,
-			ImportFile: exportFile,
+			Instance:            inst,
+			Fqbn:                fqbn,
+			SketchPath:          sketchPath.String(),
+			Port:                port,
+			Verbose:             verbose,
+			Verify:              verify,
+			ImportFile:          exportFile,
+			BuildPath:           buildPath,
+			ImportFromBuildPath: true,
 		}, os.Stdout, os.Stderr)
 
 		if err != nil {
diff --git a/cli/upload/upload.go b/cli/upload/upload.go
index c5a735add97..6211529604e 100644
--- a/cli/upload/upload.go
+++ b/cli/upload/upload.go
@@ -30,11 +30,13 @@ import (
 )
 
 var (
-	fqbn       string
-	port       string
-	verbose    bool
-	verify     bool
-	importFile string
+	fqbn                string
+	port                string
+	verbose             bool
+	verify              bool
+	importFile          string
+	buildPath           string
+	importFromBuildPath bool
 )
 
 // NewCommand created a new `upload` command
@@ -53,6 +55,8 @@ func NewCommand() *cobra.Command {
 	uploadCommand.Flags().StringVarP(&importFile, "input", "i", "", "Input file to be uploaded.")
 	uploadCommand.Flags().BoolVarP(&verify, "verify", "t", false, "Verify uploaded binary after the upload.")
 	uploadCommand.Flags().BoolVarP(&verbose, "verbose", "v", false, "Optional, turns on verbose mode.")
+	uploadCommand.Flags().StringVarP(&buildPath, "build-path", "", "", "Optional, specify build path (can be used with --upload-from-build-path).")
+	uploadCommand.Flags().BoolVarP(&importFromBuildPath, "upload-from-build-path", "n", false, "Optional, use binaries produced in build path for uploading.")
 
 	return uploadCommand
 }
@@ -71,13 +75,15 @@ func run(command *cobra.Command, args []string) {
 	sketchPath := initSketchPath(path)
 
 	if _, err := upload.Upload(context.Background(), &rpc.UploadReq{
-		Instance:   instance,
-		Fqbn:       fqbn,
-		SketchPath: sketchPath.String(),
-		Port:       port,
-		Verbose:    verbose,
-		Verify:     verify,
-		ImportFile: importFile,
+		Instance:            instance,
+		Fqbn:                fqbn,
+		SketchPath:          sketchPath.String(),
+		Port:                port,
+		Verbose:             verbose,
+		Verify:              verify,
+		ImportFile:          importFile,
+		ImportFromBuildPath: importFromBuildPath,
+		BuildPath:           buildPath,
 	}, os.Stdout, os.Stderr); err != nil {
 		feedback.Errorf("Error during Upload: %v", err)
 		os.Exit(errorcodes.ErrGeneric)
diff --git a/commands/compile/compile.go b/commands/compile/compile.go
index 43ebfb39b2c..5773b3780f9 100644
--- a/commands/compile/compile.go
+++ b/commands/compile/compile.go
@@ -25,6 +25,7 @@ import (
 	"strconv"
 	"strings"
 
+	bldr "github.com/arduino/arduino-cli/arduino/builder"
 	"github.com/arduino/arduino-cli/arduino/cores"
 	"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
 	"github.com/arduino/arduino-cli/arduino/sketches"
@@ -114,6 +115,7 @@ func Compile(ctx context.Context, req *rpc.CompileReq, outStream, errStream io.W
 	builderCtx.PackageManager = pm
 	builderCtx.FQBN = fqbn
 	builderCtx.SketchLocation = sketch.FullPath
+	builderCtx.BuildPath = bldr.GenBuildPath(sketch.FullPath)
 
 	// FIXME: This will be redundant when arduino-builder will be part of the cli
 	builderCtx.HardwareDirs = configuration.HardwareDirectories()
diff --git a/commands/upload/upload.go b/commands/upload/upload.go
index c373c9b049f..67732108339 100644
--- a/commands/upload/upload.go
+++ b/commands/upload/upload.go
@@ -25,6 +25,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/arduino/arduino-cli/arduino/builder"
 	"github.com/arduino/arduino-cli/arduino/cores"
 	"github.com/arduino/arduino-cli/arduino/sketches"
 	"github.com/arduino/arduino-cli/cli/feedback"
@@ -51,6 +52,7 @@ func Upload(ctx context.Context, req *rpc.UploadReq, outStream io.Writer, errStr
 	if err != nil {
 		return nil, fmt.Errorf("opening sketch: %s", err)
 	}
+	logrus.WithField("sketchPath", sketchPath).Trace("Sketch to upload")
 
 	// FIXME: make a specification on how a port is specified via command line
 	port := req.GetPort()
@@ -66,6 +68,7 @@ func Upload(ctx context.Context, req *rpc.UploadReq, outStream io.Writer, errStr
 	if port == "" {
 		return nil, fmt.Errorf("no upload port provided")
 	}
+	logrus.WithField("port", port).Trace("Port used for upload")
 
 	fqbnIn := req.GetFqbn()
 	if fqbnIn == "" && sketch != nil && sketch.Metadata != nil {
@@ -78,6 +81,7 @@ func Upload(ctx context.Context, req *rpc.UploadReq, outStream io.Writer, errStr
 	if err != nil {
 		return nil, fmt.Errorf("incorrect FQBN: %s", err)
 	}
+	logrus.WithField("fqbn", fqbn).Trace("FQBN used for upload")
 
 	pm := commands.GetPackageManager(req.GetInstance().GetId())
 
@@ -88,17 +92,18 @@ func Upload(ctx context.Context, req *rpc.UploadReq, outStream io.Writer, errStr
 	}
 
 	// Load programmer tool
-	uploadToolPattern, have := boardProperties.GetOk("upload.tool")
-	if !have || uploadToolPattern == "" {
+	uploadToolName, have := boardProperties.GetOk("upload.tool")
+	if !have || uploadToolName == "" {
 		return nil, fmt.Errorf("cannot get programmer tool: undefined 'upload.tool' property")
 	}
+	logrus.WithField("upload.tool", uploadToolName).Trace("Tool to use for upload")
 
 	var referencedPlatformRelease *cores.PlatformRelease
-	if split := strings.Split(uploadToolPattern, ":"); len(split) > 2 {
-		return nil, fmt.Errorf("invalid 'upload.tool' property: %s", uploadToolPattern)
+	if split := strings.Split(uploadToolName, ":"); len(split) > 2 {
+		return nil, fmt.Errorf("invalid 'upload.tool' property: %s", uploadToolName)
 	} else if len(split) == 2 {
 		referencedPackageName := split[0]
-		uploadToolPattern = split[1]
+		uploadToolName = split[1]
 		architecture := board.PlatformRelease.Platform.Architecture
 
 		if referencedPackage := pm.Packages[referencedPackageName]; referencedPackage == nil {
@@ -108,6 +113,10 @@ func Upload(ctx context.Context, req *rpc.UploadReq, outStream io.Writer, errStr
 		} else {
 			referencedPlatformRelease = pm.GetInstalledPlatformRelease(referencedPlatform)
 		}
+		logrus.
+			WithField("upload.tool", uploadToolName).
+			WithField("referencedPlatform", referencedPlatformRelease).
+			Trace("Tool to use for upload")
 	}
 
 	// Build configuration for upload
@@ -119,7 +128,7 @@ func Upload(ctx context.Context, req *rpc.UploadReq, outStream io.Writer, errStr
 	uploadProperties.Merge(board.PlatformRelease.RuntimeProperties())
 	uploadProperties.Merge(boardProperties)
 
-	uploadToolProperties := uploadProperties.SubTree("tools." + uploadToolPattern)
+	uploadToolProperties := uploadProperties.SubTree("tools." + uploadToolName)
 	uploadProperties.Merge(uploadToolProperties)
 
 	if requiredTools, err := pm.FindToolsRequiredForBoard(board); err == nil {
@@ -130,62 +139,90 @@ func Upload(ctx context.Context, req *rpc.UploadReq, outStream io.Writer, errStr
 	}
 
 	// Set properties for verbose upload
-	Verbose := req.GetVerbose()
-	if Verbose {
+	if req.GetVerbose() {
 		if v, ok := uploadProperties.GetOk("upload.params.verbose"); ok {
 			uploadProperties.Set("upload.verbose", v)
+			logrus.WithField("upload.verbose", v).Trace("Setting verbosity")
 		}
 	} else {
 		if v, ok := uploadProperties.GetOk("upload.params.quiet"); ok {
 			uploadProperties.Set("upload.verbose", v)
+			logrus.WithField("upload.verbose", v).Trace("Setting verbosity")
 		}
 	}
 
 	// Set properties for verify
-	Verify := req.GetVerify()
-	if Verify {
+	if req.GetVerify() {
 		uploadProperties.Set("upload.verify", uploadProperties.Get("upload.params.verify"))
 	} else {
 		uploadProperties.Set("upload.verify", uploadProperties.Get("upload.params.noverify"))
 	}
+	logrus.WithField("upload.verify", uploadProperties.Get("upload.verify")).Trace("Setting verify")
 
 	// Set path to compiled binary
-	// Make the filename without the FQBN configs part
-	fqbn.Configs = properties.NewMap()
-	fqbnSuffix := strings.Replace(fqbn.String(), ":", ".", -1)
-
-	var importPath *paths.Path
-	var importFile string
-	if req.GetImportFile() == "" {
-		importPath = sketch.FullPath
-		importFile = sketch.Name + "." + fqbnSuffix
+
+	// The upload recipes uses "{build.path}/{build.project_name}.hex" to
+	// obtain the path to the binary to upload. This works without well if
+	// the {build.path} directory used for the build is still available (for
+	// example if the upload is run straight after the compile)...
+	if req.GetImportFromBuildPath() {
+
+		if p := req.GetBuildPath(); p == "" {
+			uploadProperties.SetPath("build.path", builder.GenBuildPath(sketch.FullPath))
+		} else {
+			uploadProperties.Set("build.path", p)
+		}
+		uploadProperties.Set("build.project_name", sketch.Name+".ino")
+
 	} else {
-		importPath = paths.New(req.GetImportFile()).Parent()
-		importFile = paths.New(req.GetImportFile()).Base()
-	}
+		// ...otherwise {build.path} and {build.project_name} should be
+		// tweaked so the upload tool will point to the sketch folder or
+		// the import files specified by the user.
+
+		var importPath *paths.Path
+		var importFile string
+		if req.GetImportFile() == "" {
+			// Make the filename without the FQBN configs part
+			fqbn.Configs = properties.NewMap()
+			fqbnSuffix := strings.Replace(fqbn.String(), ":", ".", -1)
+			importPath = sketch.FullPath
+			importFile = sketch.Name + "." + fqbnSuffix
+			logrus.WithField("importPath", importPath).WithField("importFile", importFile).Trace("Import binary from sketch")
+		} else {
+			// Use the import file specified by the user
+			importPath = paths.New(req.GetImportFile()).Parent()
+			importFile = paths.New(req.GetImportFile()).Base()
+			logrus.WithField("importPath", importPath).WithField("importFile", importFile).Trace("Import binary from user provided path")
+		}
 
-	outputTmpFile, ok := uploadProperties.GetOk("recipe.output.tmp_file")
-	outputTmpFile = uploadProperties.ExpandPropsInString(outputTmpFile)
-	if !ok {
-		return nil, fmt.Errorf("property 'recipe.output.tmp_file' not defined")
-	}
-	ext := filepath.Ext(outputTmpFile)
-	if strings.HasSuffix(importFile, ext) {
-		importFile = importFile[:len(importFile)-len(ext)]
-	}
+		outputTmpFile, ok := uploadProperties.GetOk("recipe.output.tmp_file")
+		if !ok {
+			return nil, fmt.Errorf("property 'recipe.output.tmp_file' not defined")
+		}
+		outputTmpFile = uploadProperties.ExpandPropsInString(outputTmpFile)
+		logrus.WithField("recipe.output.tmp_file", outputTmpFile).Trace("Platform variable value")
+		ext := filepath.Ext(outputTmpFile)
+		if strings.HasSuffix(importFile, ext) {
+			importFile = importFile[:len(importFile)-len(ext)]
+			logrus.WithField("importPath", importPath).WithField("importFile", importFile).Trace("Adjusted importFile value (removed extension)")
+		}
 
-	uploadProperties.SetPath("build.path", importPath)
-	uploadProperties.Set("build.project_name", importFile)
-	uploadFile := importPath.Join(importFile + ext)
-	if _, err := uploadFile.Stat(); err != nil {
-		if os.IsNotExist(err) {
-			return nil, fmt.Errorf("compiled sketch %s not found", uploadFile.String())
+		uploadProperties.SetPath("build.path", importPath)
+		uploadProperties.Set("build.project_name", importFile)
+		logrus.WithField("build.path", importPath).Trace("Set build.path value")
+		logrus.WithField("build.project_name", importFile).Trace("Set build.project_name value")
+		uploadFile := importPath.Join(importFile + ext)
+		if _, err := uploadFile.Stat(); err != nil {
+			if os.IsNotExist(err) {
+				return nil, fmt.Errorf("compiled sketch %s not found", uploadFile.String())
+			}
+			return nil, fmt.Errorf("cannot open sketch: %s", err)
 		}
-		return nil, fmt.Errorf("cannot open sketch: %s", err)
 	}
 
 	// Perform reset via 1200bps touch if requested
 	if uploadProperties.GetBoolean("upload.use_1200bps_touch") {
+		logrus.WithField("upload.use_1200bps_touch", "true").Trace("Performing 1200 bps touch")
 		ports, err := serial.GetPortsList()
 		if err != nil {
 			return nil, fmt.Errorf("cannot get serial port list: %s", err)
@@ -209,6 +246,7 @@ func Upload(ctx context.Context, req *rpc.UploadReq, outStream io.Writer, errStr
 	// Wait for upload port if requested
 	actualPort := port // default
 	if uploadProperties.GetBoolean("upload.wait_for_upload_port") {
+		logrus.WithField("upload.wait_for_upload_port", "true").Trace("Waiting for upload port...")
 		if p, err := waitForNewSerialPort(); err != nil {
 			return nil, fmt.Errorf("cannot detect serial ports: %s", err)
 		} else if p == "" {
@@ -216,6 +254,7 @@ func Upload(ctx context.Context, req *rpc.UploadReq, outStream io.Writer, errStr
 		} else {
 			actualPort = p
 		}
+		logrus.WithField("port", actualPort).Trace("...new serial port found!")
 
 		// on OS X, if the port is opened too quickly after it is detected,
 		// a "Resource busy" error occurs, add a delay to workaround.
@@ -230,14 +269,23 @@ func Upload(ctx context.Context, req *rpc.UploadReq, outStream io.Writer, errStr
 	} else {
 		uploadProperties.Set("serial.port.file", actualPort)
 	}
+	logrus.
+		WithField("serial.port", actualPort).                                    //
+		WithField("serial.port.file", uploadProperties.Get("serial.port.file")). //
+		Trace("Set property")
 
 	// Build recipe for upload
 	recipe := uploadProperties.Get("upload.pattern")
 	cmdLine := uploadProperties.ExpandPropsInString(recipe)
+	logrus.WithField("upload.pattern", recipe).Trace("Upload Recipe")
+	logrus.WithField("cmdline", cmdLine).Trace("Expanded command line")
 	cmdArgs, err := properties.SplitQuotedString(cmdLine, `"'`, false)
 	if err != nil {
 		return nil, fmt.Errorf("invalid recipe '%s': %s", recipe, err)
 	}
+	for i, arg := range cmdArgs {
+		logrus.WithField(fmt.Sprintf("arg %d", i), arg).Trace("Split command line arguments")
+	}
 
 	// Run Tool
 	cmd, err := executils.Command(cmdArgs)
diff --git a/go.mod b/go.mod
index 9589dbe49b9..53e0eddf840 100644
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,7 @@ require (
 	bou.ke/monkey v1.0.1
 	github.com/arduino/board-discovery v0.0.0-20180823133458-1ba29327fb0c
 	github.com/arduino/go-paths-helper v1.0.1
-	github.com/arduino/go-properties-orderedmap v1.0.0
+	github.com/arduino/go-properties-orderedmap v1.1.0
 	github.com/arduino/go-timeutils v0.0.0-20171220113728-d1dd9e313b1b
 	github.com/arduino/go-win32-utils v0.0.0-20180330194947-ed041402e83b
 	github.com/cmaglie/pb v1.0.27
diff --git a/go.sum b/go.sum
index 2f84109f8f6..11dc4df35ad 100644
--- a/go.sum
+++ b/go.sum
@@ -10,8 +10,8 @@ github.com/arduino/board-discovery v0.0.0-20180823133458-1ba29327fb0c h1:agh2JT9
 github.com/arduino/board-discovery v0.0.0-20180823133458-1ba29327fb0c/go.mod h1:HK7SpkEax/3P+0w78iRQx1sz1vCDYYw9RXwHjQTB5i8=
 github.com/arduino/go-paths-helper v1.0.1 h1:utYXLM2RfFlc9qp/MJTIYp3t6ux/xM6mWjeEb/WLK4Q=
 github.com/arduino/go-paths-helper v1.0.1/go.mod h1:HpxtKph+g238EJHq4geEPv9p+gl3v5YYu35Yb+w31Ck=
-github.com/arduino/go-properties-orderedmap v1.0.0 h1:caaM25TQZKkytoKQUsgqtOVbrM5i8Gb427JmW0KL05s=
-github.com/arduino/go-properties-orderedmap v1.0.0/go.mod h1:DKjD2VXY/NZmlingh4lSFMEYCVubfeArCsGPGDwb2yk=
+github.com/arduino/go-properties-orderedmap v1.1.0 h1:g7Gzw6RS0V1TlOgVh5X7vWK1pJDjwWBLS45z1JUV7tI=
+github.com/arduino/go-properties-orderedmap v1.1.0/go.mod h1:DKjD2VXY/NZmlingh4lSFMEYCVubfeArCsGPGDwb2yk=
 github.com/arduino/go-timeutils v0.0.0-20171220113728-d1dd9e313b1b h1:9hDi4F2st6dbLC3y4i02zFT5quS4X6iioWifGlVwfy4=
 github.com/arduino/go-timeutils v0.0.0-20171220113728-d1dd9e313b1b/go.mod h1:uwGy5PpN4lqW97FiLnbcx+xx8jly5YuPMJWfVwwjJiQ=
 github.com/arduino/go-win32-utils v0.0.0-20180330194947-ed041402e83b h1:3PjgYG5gVPA7cipp7vIR2lF96KkEJIFBJ+ANnuv6J20=
diff --git a/rpc/commands/commands.pb.go b/rpc/commands/commands.pb.go
index 59fe7937ed8..780bbed2f1e 100644
--- a/rpc/commands/commands.pb.go
+++ b/rpc/commands/commands.pb.go
@@ -8,6 +8,8 @@ import (
 	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
 	grpc "google.golang.org/grpc"
+	codes "google.golang.org/grpc/codes"
+	status "google.golang.org/grpc/status"
 	math "math"
 )
 
@@ -597,11 +599,11 @@ var fileDescriptor_3690061a1131852d = []byte{
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
-var _ grpc.ClientConn
+var _ grpc.ClientConnInterface
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion4
+const _ = grpc.SupportPackageIsVersion6
 
 // ArduinoCoreClient is the client API for ArduinoCore service.
 //
@@ -641,10 +643,10 @@ type ArduinoCoreClient interface {
 }
 
 type arduinoCoreClient struct {
-	cc *grpc.ClientConn
+	cc grpc.ClientConnInterface
 }
 
-func NewArduinoCoreClient(cc *grpc.ClientConn) ArduinoCoreClient {
+func NewArduinoCoreClient(cc grpc.ClientConnInterface) ArduinoCoreClient {
 	return &arduinoCoreClient{cc}
 }
 
@@ -1230,6 +1232,86 @@ type ArduinoCoreServer interface {
 	LibraryList(context.Context, *LibraryListReq) (*LibraryListResp, error)
 }
 
+// UnimplementedArduinoCoreServer can be embedded to have forward compatible implementations.
+type UnimplementedArduinoCoreServer struct {
+}
+
+func (*UnimplementedArduinoCoreServer) Init(req *InitReq, srv ArduinoCore_InitServer) error {
+	return status.Errorf(codes.Unimplemented, "method Init not implemented")
+}
+func (*UnimplementedArduinoCoreServer) Destroy(ctx context.Context, req *DestroyReq) (*DestroyResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method Destroy not implemented")
+}
+func (*UnimplementedArduinoCoreServer) Rescan(ctx context.Context, req *RescanReq) (*RescanResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method Rescan not implemented")
+}
+func (*UnimplementedArduinoCoreServer) UpdateIndex(req *UpdateIndexReq, srv ArduinoCore_UpdateIndexServer) error {
+	return status.Errorf(codes.Unimplemented, "method UpdateIndex not implemented")
+}
+func (*UnimplementedArduinoCoreServer) UpdateLibrariesIndex(req *UpdateLibrariesIndexReq, srv ArduinoCore_UpdateLibrariesIndexServer) error {
+	return status.Errorf(codes.Unimplemented, "method UpdateLibrariesIndex not implemented")
+}
+func (*UnimplementedArduinoCoreServer) Version(ctx context.Context, req *VersionReq) (*VersionResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method Version not implemented")
+}
+func (*UnimplementedArduinoCoreServer) BoardDetails(ctx context.Context, req *BoardDetailsReq) (*BoardDetailsResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method BoardDetails not implemented")
+}
+func (*UnimplementedArduinoCoreServer) BoardAttach(req *BoardAttachReq, srv ArduinoCore_BoardAttachServer) error {
+	return status.Errorf(codes.Unimplemented, "method BoardAttach not implemented")
+}
+func (*UnimplementedArduinoCoreServer) BoardList(ctx context.Context, req *BoardListReq) (*BoardListResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method BoardList not implemented")
+}
+func (*UnimplementedArduinoCoreServer) BoardListAll(ctx context.Context, req *BoardListAllReq) (*BoardListAllResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method BoardListAll not implemented")
+}
+func (*UnimplementedArduinoCoreServer) Compile(req *CompileReq, srv ArduinoCore_CompileServer) error {
+	return status.Errorf(codes.Unimplemented, "method Compile not implemented")
+}
+func (*UnimplementedArduinoCoreServer) PlatformInstall(req *PlatformInstallReq, srv ArduinoCore_PlatformInstallServer) error {
+	return status.Errorf(codes.Unimplemented, "method PlatformInstall not implemented")
+}
+func (*UnimplementedArduinoCoreServer) PlatformDownload(req *PlatformDownloadReq, srv ArduinoCore_PlatformDownloadServer) error {
+	return status.Errorf(codes.Unimplemented, "method PlatformDownload not implemented")
+}
+func (*UnimplementedArduinoCoreServer) PlatformUninstall(req *PlatformUninstallReq, srv ArduinoCore_PlatformUninstallServer) error {
+	return status.Errorf(codes.Unimplemented, "method PlatformUninstall not implemented")
+}
+func (*UnimplementedArduinoCoreServer) PlatformUpgrade(req *PlatformUpgradeReq, srv ArduinoCore_PlatformUpgradeServer) error {
+	return status.Errorf(codes.Unimplemented, "method PlatformUpgrade not implemented")
+}
+func (*UnimplementedArduinoCoreServer) Upload(req *UploadReq, srv ArduinoCore_UploadServer) error {
+	return status.Errorf(codes.Unimplemented, "method Upload not implemented")
+}
+func (*UnimplementedArduinoCoreServer) PlatformSearch(ctx context.Context, req *PlatformSearchReq) (*PlatformSearchResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method PlatformSearch not implemented")
+}
+func (*UnimplementedArduinoCoreServer) PlatformList(ctx context.Context, req *PlatformListReq) (*PlatformListResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method PlatformList not implemented")
+}
+func (*UnimplementedArduinoCoreServer) LibraryDownload(req *LibraryDownloadReq, srv ArduinoCore_LibraryDownloadServer) error {
+	return status.Errorf(codes.Unimplemented, "method LibraryDownload not implemented")
+}
+func (*UnimplementedArduinoCoreServer) LibraryInstall(req *LibraryInstallReq, srv ArduinoCore_LibraryInstallServer) error {
+	return status.Errorf(codes.Unimplemented, "method LibraryInstall not implemented")
+}
+func (*UnimplementedArduinoCoreServer) LibraryUninstall(req *LibraryUninstallReq, srv ArduinoCore_LibraryUninstallServer) error {
+	return status.Errorf(codes.Unimplemented, "method LibraryUninstall not implemented")
+}
+func (*UnimplementedArduinoCoreServer) LibraryUpgradeAll(req *LibraryUpgradeAllReq, srv ArduinoCore_LibraryUpgradeAllServer) error {
+	return status.Errorf(codes.Unimplemented, "method LibraryUpgradeAll not implemented")
+}
+func (*UnimplementedArduinoCoreServer) LibraryResolveDependencies(ctx context.Context, req *LibraryResolveDependenciesReq) (*LibraryResolveDependenciesResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method LibraryResolveDependencies not implemented")
+}
+func (*UnimplementedArduinoCoreServer) LibrarySearch(ctx context.Context, req *LibrarySearchReq) (*LibrarySearchResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method LibrarySearch not implemented")
+}
+func (*UnimplementedArduinoCoreServer) LibraryList(ctx context.Context, req *LibraryListReq) (*LibraryListResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method LibraryList not implemented")
+}
+
 func RegisterArduinoCoreServer(s *grpc.Server, srv ArduinoCoreServer) {
 	s.RegisterService(&_ArduinoCore_serviceDesc, srv)
 }
diff --git a/rpc/commands/lib.pb.go b/rpc/commands/lib.pb.go
index 3906f264c8a..93eb441985b 100644
--- a/rpc/commands/lib.pb.go
+++ b/rpc/commands/lib.pb.go
@@ -1416,85 +1416,88 @@ func init() {
 func init() { proto.RegisterFile("commands/lib.proto", fileDescriptor_9feed0d29806df6c) }
 
 var fileDescriptor_9feed0d29806df6c = []byte{
-	// 1276 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x58, 0xcd, 0x6f, 0xdc, 0x44,
-	0x14, 0xaf, 0x77, 0xdb, 0x64, 0xf7, 0x6d, 0xd2, 0x38, 0xd3, 0xb4, 0x75, 0x53, 0xda, 0x2e, 0x16,
-	0x1f, 0xdb, 0x54, 0xd9, 0xa0, 0x22, 0x55, 0xa8, 0x52, 0x41, 0x85, 0xb4, 0xa8, 0x28, 0xaa, 0x22,
-	0xf7, 0xe3, 0x00, 0x48, 0xd6, 0xac, 0xfd, 0xb2, 0x19, 0x65, 0xd6, 0x76, 0x67, 0xc6, 0x5b, 0x2d,
-	0x17, 0xbe, 0xae, 0x5c, 0xb8, 0x73, 0xe0, 0x86, 0xc4, 0x1f, 0xc7, 0x95, 0x2b, 0x9a, 0xf1, 0xd8,
-	0xfb, 0x91, 0x6c, 0x12, 0x50, 0x54, 0x10, 0xa7, 0xf8, 0x7d, 0xce, 0xef, 0xcd, 0x7b, 0xef, 0x67,
-	0x67, 0x81, 0x44, 0xe9, 0x60, 0x40, 0x93, 0x58, 0x6e, 0x71, 0xd6, 0xeb, 0x66, 0x22, 0x55, 0x29,
-	0xb9, 0x1a, 0x45, 0x5d, 0x2a, 0xe2, 0x9c, 0x25, 0x69, 0x37, 0xe2, 0xac, 0x5b, 0xba, 0xac, 0x5f,
-	0xae, 0x9c, 0xf5, 0x43, 0x9a, 0x14, 0xfe, 0xfe, 0xf7, 0x0e, 0x90, 0x1d, 0xd6, 0x13, 0x54, 0x8c,
-	0xb6, 0xd3, 0xd7, 0x09, 0x4f, 0x69, 0x1c, 0xe0, 0x2b, 0xf2, 0x00, 0x1a, 0x2c, 0x91, 0x8a, 0x26,
-	0x11, 0x7a, 0x4e, 0xdb, 0xe9, 0xb4, 0xee, 0xbe, 0xdd, 0x9d, 0x93, 0xb9, 0xfb, 0xc4, 0x3a, 0x06,
-	0x55, 0x08, 0x21, 0x70, 0x3e, 0xa1, 0x03, 0xf4, 0x6a, 0x6d, 0xa7, 0xd3, 0x0c, 0xcc, 0x33, 0xf1,
-	0x60, 0x71, 0x88, 0x42, 0xb2, 0x34, 0xf1, 0xea, 0x46, 0x5d, 0x8a, 0xfe, 0xd7, 0x70, 0xe9, 0x10,
-	0x04, 0x99, 0x91, 0x47, 0xd0, 0xc8, 0x44, 0xda, 0x17, 0x28, 0xa5, 0xc5, 0x70, 0x7b, 0x2e, 0x86,
-	0x32, 0x70, 0xd7, 0x06, 0x04, 0x55, 0xa8, 0xff, 0x9d, 0x03, 0xab, 0x36, 0xbd, 0x41, 0xca, 0xf9,
-	0x1b, 0x2f, 0xf0, 0xb7, 0xf1, 0x25, 0x57, 0x10, 0xce, 0xac, 0x40, 0xf2, 0x05, 0x2c, 0x2b, 0x2a,
-	0x0f, 0xc2, 0x2a, 0x57, 0xcd, 0xe4, 0x7a, 0x77, 0x6e, 0xae, 0xe7, 0x54, 0x1e, 0x54, 0x79, 0x96,
-	0xd4, 0x84, 0xe4, 0xff, 0xe0, 0x54, 0xbd, 0x78, 0x91, 0xb0, 0x7f, 0xe9, 0xba, 0x7a, 0xb0, 0x76,
-	0x18, 0x83, 0xcc, 0x0e, 0x17, 0xea, 0xfc, 0xf3, 0x42, 0x5f, 0x8c, 0xcf, 0xc8, 0xfa, 0x82, 0xc6,
-	0xf8, 0xf0, 0x2c, 0x0a, 0xf5, 0x7f, 0x77, 0xe0, 0xf2, 0x11, 0x79, 0xff, 0x9b, 0xcd, 0xfe, 0xc9,
-	0x81, 0x1b, 0x16, 0x6c, 0x80, 0x32, 0xe5, 0x43, 0xdc, 0xc6, 0x0c, 0x93, 0x18, 0x93, 0x88, 0xa1,
-	0x7c, 0xe3, 0x6d, 0x1f, 0xc2, 0xcd, 0xe3, 0xd0, 0xc8, 0x8c, 0x3c, 0x87, 0xa5, 0x78, 0x42, 0xe7,
-	0x39, 0xed, 0x7a, 0xa7, 0x75, 0xf7, 0x83, 0xb9, 0x90, 0x4a, 0x56, 0x29, 0x63, 0x46, 0xcf, 0x14,
-	0x55, 0xb9, 0x0c, 0xa6, 0xb2, 0xf8, 0x3f, 0x3a, 0x70, 0x75, 0x8e, 0x67, 0x55, 0x81, 0x33, 0x51,
-	0x41, 0x07, 0x56, 0x2c, 0xe4, 0x00, 0x5f, 0xe5, 0x4c, 0x60, 0x6c, 0x0b, 0x9c, 0x55, 0x93, 0x0d,
-	0x70, 0xad, 0xca, 0xae, 0x3d, 0xc6, 0xb6, 0xe8, 0x43, 0x7a, 0xbf, 0x0f, 0xae, 0x05, 0xf1, 0x0c,
-	0xa9, 0x88, 0xf6, 0xcf, 0xe0, 0xfa, 0xd7, 0xe0, 0xc2, 0xab, 0x1c, 0xc5, 0xc8, 0xc2, 0x2b, 0x04,
-	0xff, 0xab, 0x8a, 0x0e, 0xcb, 0x83, 0x64, 0x46, 0x1e, 0x43, 0x93, 0x1b, 0xe5, 0xf8, 0x5a, 0x3b,
-	0x73, 0x8f, 0x2a, 0xe2, 0x30, 0x2e, 0xbb, 0x35, 0x0e, 0xf5, 0x7f, 0xad, 0xc1, 0xca, 0x8c, 0xf9,
-	0xc8, 0x3b, 0x0c, 0xa0, 0x21, 0x90, 0x23, 0x95, 0xa8, 0x27, 0x58, 0x1f, 0x77, 0xef, 0xb4, 0xc7,
-	0x75, 0x03, 0x1b, 0xf8, 0x28, 0x51, 0x62, 0x14, 0x54, 0x79, 0xc8, 0x27, 0xb0, 0xc0, 0xa9, 0x42,
-	0xa9, 0xcc, 0x1d, 0xb7, 0xee, 0xbe, 0x7f, 0xd2, 0x5c, 0xd8, 0x44, 0x81, 0x0d, 0x5b, 0x8f, 0x61,
-	0x79, 0x2a, 0x37, 0x71, 0xa1, 0x7e, 0x80, 0x23, 0x0b, 0x5c, 0x3f, 0x92, 0x07, 0x70, 0x61, 0x48,
-	0x79, 0x8e, 0x76, 0xed, 0x4e, 0x7d, 0x44, 0x11, 0x75, 0xbf, 0xf6, 0x91, 0xe3, 0xff, 0x51, 0x87,
-	0x8b, 0xd3, 0x56, 0x72, 0x05, 0x16, 0x68, 0xae, 0xf6, 0x53, 0x61, 0x8f, 0xb2, 0xd2, 0xe4, 0xae,
-	0xd4, 0xa6, 0x76, 0x85, 0xdc, 0x04, 0x18, 0x50, 0x96, 0x28, 0xca, 0x12, 0x14, 0x76, 0xa6, 0x26,
-	0x34, 0x64, 0x1d, 0x1a, 0x12, 0x13, 0x85, 0x7a, 0x72, 0xce, 0x1b, 0x6b, 0x25, 0x93, 0xb7, 0xa0,
-	0x99, 0x51, 0x41, 0xfb, 0x82, 0x66, 0xfb, 0xde, 0x05, 0x63, 0x1c, 0x2b, 0xf4, 0x99, 0xaf, 0xb1,
-	0x27, 0x99, 0x42, 0x6f, 0xa1, 0x38, 0xd3, 0x8a, 0x3a, 0x67, 0x44, 0x15, 0xf6, 0x53, 0x31, 0xf2,
-	0x16, 0x8b, 0x9c, 0xa5, 0x4c, 0xde, 0x81, 0x65, 0xdd, 0x24, 0xa6, 0x30, 0x52, 0xb9, 0x40, 0xe9,
-	0x35, 0xda, 0xf5, 0x4e, 0x33, 0x98, 0x56, 0xea, 0x81, 0x54, 0xa3, 0x0c, 0xa5, 0xd7, 0x34, 0xd6,
-	0x42, 0x20, 0x9f, 0x43, 0x53, 0xa0, 0x4c, 0x73, 0x11, 0xa1, 0xf4, 0xe0, 0x94, 0xd4, 0x18, 0xd8,
-	0x88, 0x60, 0x1c, 0xab, 0xa1, 0x73, 0x16, 0x61, 0x22, 0xd1, 0x6b, 0x15, 0xd0, 0xad, 0x48, 0xee,
-	0xc0, 0x6a, 0x26, 0xd2, 0x21, 0x8b, 0x51, 0x86, 0x2c, 0x89, 0x78, 0x1e, 0xa3, 0xf4, 0x96, 0x0c,
-	0x08, 0xb7, 0x34, 0x3c, 0xb1, 0x7a, 0xf2, 0x74, 0x86, 0x65, 0x96, 0xcd, 0x7c, 0x6e, 0x9c, 0x9e,
-	0x65, 0x66, 0xf8, 0xe5, 0x65, 0xb5, 0x70, 0x63, 0x97, 0x23, 0x97, 0x62, 0x13, 0x88, 0xed, 0x6f,
-	0x18, 0xa5, 0x89, 0x54, 0x42, 0xf7, 0xd3, 0x76, 0x7e, 0xd5, 0x5a, 0x3e, 0xab, 0x0c, 0xfe, 0x2f,
-	0x0e, 0xb8, 0xb3, 0xd7, 0xa1, 0x47, 0x36, 0x17, 0xbc, 0x1c, 0xd9, 0x5c, 0x70, 0x4d, 0x57, 0xa6,
-	0x0b, 0x43, 0xdc, 0x63, 0x1c, 0x27, 0xf8, 0x78, 0x56, 0x6d, 0x1a, 0xbc, 0x8f, 0xd1, 0x81, 0xcc,
-	0x07, 0x76, 0xa4, 0x2a, 0x59, 0xe3, 0x95, 0xec, 0x9b, 0x62, 0x98, 0xea, 0x81, 0x79, 0xd6, 0x83,
-	0x14, 0xd1, 0x68, 0x1f, 0x33, 0xaa, 0xaa, 0x41, 0xaa, 0x14, 0xfe, 0xb7, 0xd5, 0x98, 0xef, 0x30,
-	0xa9, 0xce, 0x80, 0xce, 0x5c, 0xa8, 0x53, 0xce, 0x0d, 0xf8, 0x46, 0xa0, 0x1f, 0x35, 0x80, 0x3c,
-	0x8b, 0xa9, 0xa2, 0x3d, 0x8e, 0x06, 0x71, 0x23, 0x18, 0x2b, 0x7c, 0x06, 0x2b, 0x53, 0x00, 0x64,
-	0x46, 0x5e, 0xc2, 0x2a, 0x2b, 0x19, 0x37, 0x2c, 0x58, 0x6b, 0x64, 0xe9, 0xee, 0xf6, 0xf1, 0x50,
-	0x74, 0x44, 0xb9, 0xb5, 0x2e, 0x9b, 0xd1, 0xf8, 0x3f, 0x3b, 0xe0, 0xce, 0xba, 0x91, 0xfb, 0x7a,
-	0x1c, 0xcb, 0x23, 0x74, 0xb5, 0xed, 0x13, 0xd9, 0xa2, 0x0c, 0x20, 0x0f, 0x61, 0xd1, 0xf2, 0xda,
-	0xdf, 0x65, 0x9a, 0x32, 0xce, 0xff, 0x73, 0x01, 0x16, 0x8f, 0xa3, 0xe0, 0x31, 0xe9, 0xd4, 0xa6,
-	0x48, 0xe7, 0xff, 0x44, 0x2d, 0xb7, 0xa0, 0x65, 0x7b, 0x15, 0xc6, 0x4c, 0x18, 0x72, 0x69, 0x06,
-	0x60, 0x55, 0xdb, 0x4c, 0x90, 0x1b, 0x00, 0xc5, 0xe2, 0x18, 0x7b, 0xc1, 0x1a, 0xcd, 0x42, 0xa3,
-	0xcd, 0xb7, 0xa0, 0x95, 0x2b, 0xc6, 0x99, 0x1a, 0x19, 0xfb, 0x52, 0x11, 0x6f, 0x55, 0xda, 0x61,
-	0x53, 0xff, 0x13, 0x66, 0x6f, 0x26, 0xcc, 0x38, 0x55, 0x7b, 0xa9, 0x18, 0x78, 0x17, 0x8b, 0x95,
-	0xad, 0x2c, 0xbb, 0xd6, 0x40, 0xae, 0x6b, 0xaa, 0xa3, 0x3c, 0x34, 0xcd, 0x70, 0x8b, 0x42, 0xb5,
-	0xe2, 0xa9, 0x6e, 0x88, 0x0f, 0xcb, 0x71, 0xaa, 0x42, 0x1a, 0x72, 0x96, 0x1c, 0xd0, 0x3e, 0x7a,
-	0xab, 0x66, 0xa2, 0x5b, 0x71, 0xaa, 0x1e, 0xee, 0x14, 0x2a, 0xd2, 0x86, 0x56, 0x26, 0x30, 0x4a,
-	0x07, 0x19, 0xd3, 0x1f, 0x13, 0xa4, 0xf0, 0x98, 0x50, 0x91, 0x6b, 0xd0, 0xe0, 0x71, 0xb8, 0xc7,
-	0x69, 0x5f, 0x7a, 0x97, 0x2c, 0x0b, 0xc6, 0x8f, 0xb5, 0xa8, 0x4f, 0x67, 0x32, 0xe4, 0xd8, 0xa7,
-	0xd1, 0xc8, 0x5b, 0x33, 0xa1, 0x0d, 0x26, 0x77, 0x8c, 0x3c, 0xf9, 0xae, 0xb9, 0x3c, 0xfd, 0xae,
-	0x99, 0xa0, 0xd5, 0x2b, 0xd3, 0xb4, 0xba, 0x0b, 0x90, 0x89, 0x34, 0x43, 0xa1, 0x34, 0x4f, 0x5e,
-	0x3d, 0xdd, 0xd7, 0x58, 0x77, 0xb7, 0x0a, 0x29, 0xde, 0xe0, 0x13, 0x39, 0xc8, 0x36, 0x34, 0x78,
-	0x1a, 0x51, 0xa5, 0x61, 0x78, 0x6d, 0xa7, 0x73, 0xf1, 0x98, 0xcf, 0x90, 0x72, 0xb9, 0xad, 0x7f,
-	0x50, 0x45, 0x92, 0x8f, 0xf5, 0x97, 0xc0, 0x28, 0xcd, 0x95, 0x77, 0xcd, 0xe4, 0x78, 0xef, 0xc4,
-	0x1c, 0xc6, 0x3b, 0xb0, 0x51, 0xeb, 0x0f, 0x60, 0x65, 0x06, 0xe4, 0x11, 0x9f, 0x02, 0x6b, 0x93,
-	0x9f, 0x02, 0xcd, 0x89, 0x37, 0xfc, 0xc6, 0x3d, 0x58, 0x9e, 0xca, 0x4b, 0x56, 0xa0, 0xb5, 0xc7,
-	0xa9, 0x0a, 0x8b, 0xf4, 0xee, 0x39, 0xb2, 0x06, 0xae, 0xc0, 0x28, 0x17, 0x92, 0x0d, 0xb1, 0xd4,
-	0x3a, 0x1b, 0xd1, 0x98, 0xb0, 0xca, 0x4a, 0x56, 0xa0, 0xc5, 0x62, 0x0c, 0x7b, 0x39, 0xe3, 0x8a,
-	0x25, 0xee, 0x39, 0xd2, 0x80, 0xf3, 0xb9, 0x44, 0xe1, 0x3a, 0x3a, 0x47, 0x39, 0x70, 0x95, 0xbd,
-	0x46, 0x6e, 0xc1, 0x75, 0x81, 0x7b, 0x28, 0xf4, 0x3a, 0xc6, 0xe1, 0x21, 0x87, 0xfa, 0xa7, 0x9b,
-	0x5f, 0xde, 0xe9, 0x33, 0xb5, 0x9f, 0xf7, 0xf4, 0x25, 0x6c, 0xd9, 0x4b, 0x29, 0xff, 0x6e, 0x46,
-	0x9c, 0x6d, 0x89, 0x2c, 0xda, 0x2a, 0x2f, 0xa8, 0xb7, 0x60, 0x7e, 0x26, 0xf8, 0xf0, 0xaf, 0x00,
-	0x00, 0x00, 0xff, 0xff, 0x9c, 0x45, 0xeb, 0x72, 0x6c, 0x10, 0x00, 0x00,
+	// 1318 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x58, 0xcb, 0x6f, 0xdb, 0x46,
+	0x13, 0x0f, 0xad, 0x44, 0x96, 0x46, 0x76, 0x4c, 0x6f, 0x9c, 0x84, 0x71, 0xbe, 0x24, 0xfe, 0x88,
+	0x3e, 0x14, 0xa7, 0x96, 0x0b, 0x17, 0x08, 0x8a, 0x00, 0x69, 0x91, 0xd6, 0x49, 0x91, 0xc2, 0x08,
+	0x0c, 0xe6, 0x71, 0x28, 0x0a, 0x10, 0x2b, 0x72, 0x2c, 0x2f, 0xbc, 0x22, 0x99, 0xdd, 0xa5, 0x02,
+	0xf5, 0xd2, 0xd7, 0xb5, 0x97, 0xde, 0x7b, 0x68, 0x4f, 0x05, 0xfa, 0xc7, 0xf5, 0xda, 0x6b, 0xb1,
+	0xcb, 0x25, 0x45, 0xc9, 0x76, 0xec, 0x16, 0x46, 0x5a, 0xf4, 0x64, 0xce, 0xfb, 0x37, 0x3b, 0xb3,
+	0x3f, 0x52, 0x06, 0x12, 0xa5, 0xc3, 0x21, 0x4d, 0x62, 0xb9, 0xc9, 0x59, 0xbf, 0x97, 0x89, 0x54,
+	0xa5, 0xe4, 0x6a, 0x14, 0xf5, 0xa8, 0x88, 0x73, 0x96, 0xa4, 0xbd, 0x88, 0xb3, 0x5e, 0xe9, 0xb2,
+	0x7a, 0xb9, 0x72, 0xd6, 0x0f, 0x69, 0x52, 0xf8, 0xfb, 0xdf, 0x3a, 0x40, 0x76, 0x58, 0x5f, 0x50,
+	0x31, 0xde, 0x4e, 0x5f, 0x25, 0x3c, 0xa5, 0x71, 0x80, 0x2f, 0xc9, 0x7d, 0x68, 0xb1, 0x44, 0x2a,
+	0x9a, 0x44, 0xe8, 0x39, 0x6b, 0x4e, 0xb7, 0xb3, 0xf5, 0xff, 0xde, 0x31, 0x99, 0x7b, 0x8f, 0xad,
+	0x63, 0x50, 0x85, 0x10, 0x02, 0xe7, 0x13, 0x3a, 0x44, 0x6f, 0x6e, 0xcd, 0xe9, 0xb6, 0x03, 0xf3,
+	0x4c, 0x3c, 0x98, 0x1f, 0xa1, 0x90, 0x2c, 0x4d, 0xbc, 0x86, 0x51, 0x97, 0xa2, 0xff, 0x25, 0x5c,
+	0x3a, 0x04, 0x41, 0x66, 0xe4, 0x21, 0xb4, 0x32, 0x91, 0x0e, 0x04, 0x4a, 0x69, 0x31, 0xdc, 0x3e,
+	0x16, 0x43, 0x19, 0xb8, 0x6b, 0x03, 0x82, 0x2a, 0xd4, 0xff, 0xc6, 0x81, 0x65, 0x9b, 0xde, 0x20,
+	0xe5, 0xfc, 0x8d, 0x37, 0xf8, 0xeb, 0xe4, 0x90, 0x2b, 0x08, 0x67, 0xd6, 0x20, 0xf9, 0x1c, 0x16,
+	0x15, 0x95, 0x07, 0x61, 0x95, 0x6b, 0xce, 0xe4, 0x7a, 0xfb, 0xd8, 0x5c, 0xcf, 0xa8, 0x3c, 0xa8,
+	0xf2, 0x2c, 0xa8, 0x9a, 0xe4, 0x7f, 0xe7, 0x54, 0xb3, 0x78, 0x9e, 0xb0, 0x7f, 0xe8, 0xb8, 0xfa,
+	0xb0, 0x72, 0x18, 0x83, 0xcc, 0x0e, 0x37, 0xea, 0xfc, 0xfd, 0x46, 0x9f, 0x4f, 0x6a, 0x64, 0x03,
+	0x41, 0x63, 0x7c, 0x70, 0x16, 0x8d, 0xfa, 0xbf, 0x39, 0x70, 0xf9, 0x88, 0xbc, 0xff, 0xce, 0x61,
+	0xff, 0xe0, 0xc0, 0x0d, 0x0b, 0x36, 0x40, 0x99, 0xf2, 0x11, 0x6e, 0x63, 0x86, 0x49, 0x8c, 0x49,
+	0xc4, 0x50, 0xbe, 0xf1, 0xb1, 0x8f, 0xe0, 0xe6, 0xeb, 0xd0, 0xc8, 0x8c, 0x3c, 0x83, 0x85, 0xb8,
+	0xa6, 0xf3, 0x9c, 0xb5, 0x46, 0xb7, 0xb3, 0xf5, 0xfe, 0xb1, 0x90, 0x4a, 0x56, 0x29, 0x63, 0xc6,
+	0x4f, 0x15, 0x55, 0xb9, 0x0c, 0xa6, 0xb2, 0xf8, 0xdf, 0x3b, 0x70, 0xf5, 0x18, 0xcf, 0xaa, 0x03,
+	0xa7, 0xd6, 0x41, 0x17, 0x96, 0x2c, 0xe4, 0x00, 0x5f, 0xe6, 0x4c, 0x60, 0x6c, 0x1b, 0x9c, 0x55,
+	0x93, 0x75, 0x70, 0xad, 0xca, 0x5e, 0x7b, 0x8c, 0x6d, 0xd3, 0x87, 0xf4, 0xfe, 0x00, 0x5c, 0x0b,
+	0xe2, 0x29, 0x52, 0x11, 0xed, 0x9f, 0xc1, 0xf1, 0xaf, 0xc0, 0x85, 0x97, 0x39, 0x8a, 0xb1, 0x85,
+	0x57, 0x08, 0xfe, 0x2f, 0x13, 0x3e, 0x2c, 0x2b, 0xc9, 0x8c, 0x3c, 0x82, 0x36, 0x37, 0xca, 0xc9,
+	0xb9, 0x76, 0x8f, 0xad, 0x55, 0xc4, 0x61, 0x5c, 0x8e, 0x6b, 0x12, 0x4a, 0xb6, 0xa1, 0x29, 0xcd,
+	0xd1, 0x99, 0xa2, 0x17, 0xb7, 0xde, 0x3b, 0x69, 0x38, 0x45, 0x2e, 0x3b, 0x18, 0x1b, 0xeb, 0xff,
+	0x3c, 0x07, 0x4b, 0x33, 0x45, 0x8e, 0x1c, 0x45, 0x00, 0x2d, 0x81, 0x1c, 0xa9, 0x44, 0x5d, 0x4f,
+	0x83, 0xbe, 0x7b, 0x5a, 0xd0, 0xbd, 0xc0, 0x06, 0x3e, 0x4c, 0x94, 0x18, 0x07, 0x55, 0x1e, 0xf2,
+	0x31, 0x34, 0x39, 0x55, 0x28, 0x95, 0x19, 0x55, 0x67, 0xeb, 0xdd, 0x93, 0x3a, 0xb0, 0x89, 0x02,
+	0x1b, 0xb6, 0x1a, 0xc3, 0xe2, 0x54, 0x6e, 0xe2, 0x42, 0xe3, 0x00, 0xc7, 0x16, 0xb8, 0x7e, 0x24,
+	0xf7, 0xe1, 0xc2, 0x88, 0xf2, 0x1c, 0xed, 0xed, 0x3d, 0x75, 0x89, 0x22, 0xea, 0xde, 0xdc, 0x87,
+	0x8e, 0xff, 0x7b, 0x03, 0x2e, 0x4e, 0x5b, 0xc9, 0x15, 0x68, 0xd2, 0x5c, 0xed, 0xa7, 0xc2, 0x96,
+	0xb2, 0x52, 0xfd, 0xca, 0xcd, 0x4d, 0x5d, 0x39, 0x72, 0x13, 0x60, 0x48, 0x59, 0xa2, 0x28, 0x4b,
+	0x50, 0xd8, 0xd5, 0xac, 0x69, 0xc8, 0x2a, 0xb4, 0x24, 0x26, 0x0a, 0xf5, 0x02, 0x9e, 0x37, 0xd6,
+	0x4a, 0x26, 0xff, 0x83, 0x76, 0x46, 0x05, 0x1d, 0x08, 0x9a, 0xed, 0x7b, 0x17, 0x8c, 0x71, 0xa2,
+	0xd0, 0x35, 0x5f, 0x61, 0x5f, 0x32, 0x85, 0x5e, 0xb3, 0xa8, 0x69, 0x45, 0x9d, 0x33, 0xa2, 0x0a,
+	0x07, 0xa9, 0x18, 0x7b, 0xf3, 0x45, 0xce, 0x52, 0x26, 0x6f, 0xc1, 0xa2, 0x1e, 0x12, 0x53, 0x18,
+	0xa9, 0x5c, 0xa0, 0xf4, 0x5a, 0x6b, 0x8d, 0x6e, 0x3b, 0x98, 0x56, 0xea, 0xbd, 0x56, 0xe3, 0x0c,
+	0xa5, 0xd7, 0x36, 0xd6, 0x42, 0x20, 0x9f, 0x41, 0x5b, 0xa0, 0x4c, 0x73, 0x11, 0xa1, 0xf4, 0xe0,
+	0x94, 0x0c, 0x1b, 0xd8, 0x88, 0x60, 0x12, 0xab, 0xa1, 0x73, 0x16, 0x61, 0x22, 0xd1, 0xeb, 0x14,
+	0xd0, 0xad, 0x48, 0xee, 0xc0, 0x72, 0x26, 0xd2, 0x11, 0x8b, 0x51, 0x86, 0x2c, 0x89, 0x78, 0x1e,
+	0xa3, 0xf4, 0x16, 0x0c, 0x08, 0xb7, 0x34, 0x3c, 0xb6, 0x7a, 0xf2, 0x64, 0x86, 0xac, 0x16, 0xcd,
+	0x7e, 0xae, 0x9f, 0x9e, 0xac, 0x66, 0x68, 0xea, 0x45, 0x75, 0x6d, 0x27, 0x2e, 0x47, 0x5e, 0x8a,
+	0x0d, 0x20, 0x76, 0xbe, 0x61, 0x94, 0x26, 0x52, 0x09, 0x3d, 0x4f, 0x3b, 0xf9, 0x65, 0x6b, 0xf9,
+	0xb4, 0x32, 0xf8, 0x3f, 0x39, 0xe0, 0xce, 0x1e, 0x87, 0x5e, 0xd9, 0x5c, 0xf0, 0x72, 0x65, 0x73,
+	0xc1, 0x35, 0xeb, 0x99, 0x29, 0x8c, 0x70, 0x8f, 0x71, 0xac, 0xd1, 0xfa, 0xac, 0xda, 0x0c, 0x78,
+	0x1f, 0xa3, 0x03, 0x99, 0x0f, 0xed, 0x4a, 0x55, 0xb2, 0xc6, 0x2b, 0xd9, 0x57, 0xc5, 0x32, 0x35,
+	0x02, 0xf3, 0xac, 0x17, 0x29, 0xa2, 0xd1, 0x3e, 0x66, 0x54, 0x55, 0x8b, 0x54, 0x29, 0xfc, 0xaf,
+	0xab, 0x35, 0xdf, 0x61, 0x52, 0x9d, 0x01, 0x2b, 0xba, 0xd0, 0xa0, 0x9c, 0x1b, 0xf0, 0xad, 0x40,
+	0x3f, 0x6a, 0x00, 0x79, 0x16, 0x53, 0x45, 0xfb, 0x1c, 0x0d, 0xe2, 0x56, 0x30, 0x51, 0xf8, 0x0c,
+	0x96, 0xa6, 0x00, 0xc8, 0x8c, 0xbc, 0x80, 0x65, 0x56, 0x12, 0x77, 0x58, 0x70, 0xdf, 0xd8, 0x92,
+	0xe6, 0xed, 0xd7, 0x43, 0xd1, 0x11, 0xe5, 0xad, 0x75, 0xd9, 0x8c, 0xc6, 0xff, 0xd1, 0x01, 0x77,
+	0xd6, 0x8d, 0xdc, 0xd3, 0xeb, 0x58, 0x96, 0xd0, 0xdd, 0xae, 0x9d, 0xc8, 0x16, 0x65, 0x00, 0x79,
+	0x00, 0xf3, 0x96, 0xd7, 0xfe, 0x2a, 0xd3, 0x94, 0x71, 0xfe, 0x1f, 0x4d, 0x98, 0x7f, 0x1d, 0x05,
+	0x4f, 0x48, 0x67, 0x6e, 0x8a, 0x74, 0xfe, 0x4b, 0xd4, 0x72, 0x0b, 0x3a, 0x76, 0x56, 0x61, 0xcc,
+	0x84, 0x21, 0x97, 0x76, 0x00, 0x56, 0xb5, 0xcd, 0x04, 0xb9, 0x01, 0x50, 0x5c, 0x1c, 0x63, 0x2f,
+	0x58, 0xa3, 0x5d, 0x68, 0xb4, 0xf9, 0x16, 0x74, 0x72, 0xc5, 0x38, 0x53, 0x63, 0x63, 0x5f, 0x28,
+	0xe2, 0xad, 0x4a, 0x3b, 0x6c, 0xe8, 0xdf, 0x72, 0xf6, 0x64, 0xc2, 0x8c, 0x53, 0xb5, 0x97, 0x8a,
+	0xa1, 0x77, 0xb1, 0xb8, 0xb2, 0x95, 0x65, 0xd7, 0x1a, 0xc8, 0x75, 0x4d, 0x75, 0x94, 0x87, 0x66,
+	0x18, 0x6e, 0xd1, 0xa8, 0x56, 0x3c, 0xd1, 0x03, 0xf1, 0x61, 0x31, 0x4e, 0x55, 0x48, 0x43, 0xce,
+	0x92, 0x03, 0x3a, 0x40, 0x6f, 0xd9, 0x6c, 0x74, 0x27, 0x4e, 0xd5, 0x83, 0x9d, 0x42, 0x45, 0xd6,
+	0xa0, 0x93, 0x09, 0x8c, 0xd2, 0x61, 0xc6, 0xf4, 0x37, 0x09, 0x29, 0x3c, 0x6a, 0x2a, 0x72, 0x0d,
+	0x5a, 0x3c, 0x0e, 0xf7, 0x38, 0x1d, 0x48, 0xef, 0x92, 0x65, 0xc1, 0xf8, 0x91, 0x16, 0x75, 0x75,
+	0x26, 0x43, 0x8e, 0x03, 0x1a, 0x8d, 0xbd, 0x15, 0x13, 0xda, 0x62, 0x72, 0xc7, 0xc8, 0xf5, 0x77,
+	0xcd, 0xe5, 0xe9, 0x77, 0x4d, 0x8d, 0x56, 0xaf, 0x4c, 0xd3, 0xea, 0x2e, 0x40, 0x26, 0xd2, 0x0c,
+	0x85, 0xd2, 0x3c, 0x79, 0xf5, 0x74, 0x1f, 0x75, 0xbd, 0xdd, 0x2a, 0xa4, 0x78, 0x83, 0xd7, 0x72,
+	0x90, 0x6d, 0x68, 0xf1, 0x34, 0xa2, 0x4a, 0xc3, 0xf0, 0xcc, 0x77, 0x48, 0xf7, 0xa4, 0x7c, 0x3b,
+	0xd6, 0x3f, 0xa8, 0x22, 0xc9, 0x47, 0xfa, 0x4b, 0x60, 0x9c, 0xe6, 0xca, 0xbb, 0x66, 0x72, 0xbc,
+	0x73, 0x62, 0x0e, 0xe3, 0x1d, 0xd8, 0xa8, 0xd5, 0xfb, 0xb0, 0x34, 0x03, 0xf2, 0x88, 0x4f, 0x81,
+	0x95, 0xfa, 0xa7, 0x40, 0xbb, 0xf6, 0x86, 0x5f, 0xef, 0x55, 0x3f, 0xc5, 0xea, 0xdf, 0x48, 0x04,
+	0xa0, 0xb9, 0x47, 0xf5, 0x8c, 0xdc, 0x73, 0xa4, 0x03, 0xf3, 0x32, 0x8f, 0x22, 0x94, 0xd2, 0x75,
+	0xd6, 0xef, 0xc2, 0xe2, 0x14, 0x0e, 0xb2, 0x04, 0x9d, 0x3d, 0x4e, 0x55, 0x58, 0xc0, 0x71, 0xcf,
+	0x91, 0x15, 0x70, 0x05, 0x46, 0xb9, 0x90, 0x6c, 0x84, 0xa5, 0xd6, 0x59, 0x8f, 0x26, 0x04, 0x57,
+	0x76, 0xbe, 0x04, 0x1d, 0x16, 0x63, 0xd8, 0xcf, 0x19, 0x57, 0x2c, 0x71, 0xcf, 0x91, 0x16, 0x9c,
+	0xcf, 0x25, 0x0a, 0xd7, 0xd1, 0x39, 0xca, 0x05, 0xad, 0xec, 0x73, 0xe4, 0x16, 0x5c, 0x17, 0xb8,
+	0x87, 0x42, 0x5f, 0xdf, 0x38, 0x3c, 0xe4, 0xd0, 0xf8, 0x64, 0xe3, 0x8b, 0x3b, 0x03, 0xa6, 0xf6,
+	0xf3, 0xbe, 0x3e, 0xb4, 0x4d, 0x7b, 0x88, 0xe5, 0xdf, 0x8d, 0x88, 0xb3, 0x4d, 0x91, 0x45, 0x9b,
+	0xe5, 0x81, 0xf6, 0x9b, 0xe6, 0xbf, 0x13, 0x1f, 0xfc, 0x19, 0x00, 0x00, 0xff, 0xff, 0x01, 0x14,
+	0xc2, 0xc0, 0xe3, 0x10, 0x00, 0x00,
 }
diff --git a/rpc/commands/upload.pb.go b/rpc/commands/upload.pb.go
index 47d5b983876..3fa9a006c51 100644
--- a/rpc/commands/upload.pb.go
+++ b/rpc/commands/upload.pb.go
@@ -28,6 +28,8 @@ type UploadReq struct {
 	Verbose              bool      `protobuf:"varint,5,opt,name=verbose,proto3" json:"verbose,omitempty"`
 	Verify               bool      `protobuf:"varint,6,opt,name=verify,proto3" json:"verify,omitempty"`
 	ImportFile           string    `protobuf:"bytes,7,opt,name=import_file,json=importFile,proto3" json:"import_file,omitempty"`
+	BuildPath            string    `protobuf:"bytes,8,opt,name=build_path,json=buildPath,proto3" json:"build_path,omitempty"`
+	ImportFromBuildPath  bool      `protobuf:"varint,9,opt,name=import_from_build_path,json=importFromBuildPath,proto3" json:"import_from_build_path,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
 	XXX_unrecognized     []byte    `json:"-"`
 	XXX_sizecache        int32     `json:"-"`
@@ -107,6 +109,20 @@ func (m *UploadReq) GetImportFile() string {
 	return ""
 }
 
+func (m *UploadReq) GetBuildPath() string {
+	if m != nil {
+		return m.BuildPath
+	}
+	return ""
+}
+
+func (m *UploadReq) GetImportFromBuildPath() bool {
+	if m != nil {
+		return m.ImportFromBuildPath
+	}
+	return false
+}
+
 type UploadResp struct {
 	OutStream            []byte   `protobuf:"bytes,1,opt,name=out_stream,json=outStream,proto3" json:"out_stream,omitempty"`
 	ErrStream            []byte   `protobuf:"bytes,2,opt,name=err_stream,json=errStream,proto3" json:"err_stream,omitempty"`
@@ -162,24 +178,26 @@ func init() {
 func init() { proto.RegisterFile("commands/upload.proto", fileDescriptor_cd642cc079f8acdb) }
 
 var fileDescriptor_cd642cc079f8acdb = []byte{
-	// 291 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x90, 0x4f, 0x4b, 0xc4, 0x30,
-	0x10, 0xc5, 0xe9, 0xba, 0xee, 0x9f, 0x59, 0x4f, 0x01, 0x35, 0x08, 0xe2, 0xba, 0xa7, 0x05, 0xd9,
-	0x14, 0xf4, 0xec, 0xc5, 0x83, 0xa0, 0x27, 0xa9, 0x78, 0xf1, 0x52, 0xd2, 0x34, 0xb5, 0xc1, 0x36,
-	0xc9, 0x26, 0xe9, 0x82, 0x5f, 0xd8, 0xcf, 0x21, 0x49, 0x1a, 0x3d, 0x79, 0xca, 0x64, 0x7e, 0xef,
-	0xcd, 0x30, 0x0f, 0x4e, 0x99, 0xea, 0x7b, 0x2a, 0x6b, 0x9b, 0x0f, 0xba, 0x53, 0xb4, 0x26, 0xda,
-	0x28, 0xa7, 0xd0, 0x39, 0x63, 0x84, 0x9a, 0x7a, 0x10, 0x52, 0x11, 0xd6, 0x09, 0x92, 0x54, 0x17,
-	0x7f, 0x7a, 0x5f, 0x28, 0x19, 0xf5, 0x9b, 0xef, 0x0c, 0x96, 0x6f, 0x61, 0x40, 0xc1, 0xf7, 0xe8,
-	0x1e, 0x16, 0x42, 0x5a, 0x47, 0x25, 0xe3, 0x38, 0x5b, 0x67, 0xdb, 0xd5, 0xed, 0x35, 0xf9, 0x67,
-	0x20, 0x79, 0x1a, 0x85, 0xc5, 0xaf, 0x05, 0x21, 0x98, 0x36, 0xfb, 0x4a, 0xe2, 0xc9, 0x3a, 0xdb,
-	0x2e, 0x8b, 0x50, 0xa3, 0x2b, 0x58, 0xd9, 0x4f, 0xee, 0x58, 0x5b, 0x6a, 0xea, 0x5a, 0x7c, 0x14,
-	0x10, 0xc4, 0xd6, 0x0b, 0x75, 0xad, 0x37, 0x69, 0x65, 0x1c, 0x9e, 0x46, 0x93, 0xaf, 0x11, 0x86,
-	0xf9, 0x81, 0x9b, 0x4a, 0x59, 0x8e, 0x8f, 0xd7, 0xd9, 0x76, 0x51, 0xa4, 0x2f, 0x3a, 0x83, 0xd9,
-	0x81, 0x1b, 0xd1, 0x7c, 0xe1, 0x59, 0x00, 0xe3, 0xcf, 0xaf, 0x11, 0xbd, 0xf7, 0x96, 0x8d, 0xe8,
-	0x38, 0x9e, 0xc7, 0x35, 0xb1, 0xf5, 0x28, 0x3a, 0xbe, 0x79, 0x06, 0x48, 0x77, 0x5a, 0x8d, 0x2e,
-	0x01, 0xd4, 0xe0, 0x4a, 0xeb, 0x0c, 0xa7, 0x7d, 0x38, 0xf5, 0xa4, 0x58, 0xaa, 0xc1, 0xbd, 0x86,
-	0x86, 0xc7, 0xdc, 0x98, 0x84, 0x27, 0x11, 0x73, 0x63, 0x22, 0x7e, 0xd8, 0xbd, 0xdf, 0x7c, 0x08,
-	0xd7, 0x0e, 0x95, 0x4f, 0x23, 0x1f, 0xd3, 0x49, 0xef, 0x8e, 0x75, 0x22, 0x37, 0x9a, 0xe5, 0x29,
-	0xa9, 0x6a, 0x16, 0xa2, 0xbe, 0xfb, 0x09, 0x00, 0x00, 0xff, 0xff, 0xfc, 0xf8, 0xc5, 0x33, 0xb3,
-	0x01, 0x00, 0x00,
+	// 325 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x51, 0x3f, 0x4f, 0xfb, 0x30,
+	0x10, 0x55, 0xfa, 0xeb, 0xaf, 0x6d, 0xae, 0x4c, 0x46, 0x14, 0x0b, 0x09, 0x51, 0x3a, 0x55, 0x42,
+	0x4d, 0x24, 0x3a, 0xb3, 0x74, 0x40, 0x82, 0x09, 0x05, 0xb1, 0xb0, 0x44, 0x8e, 0xe3, 0x12, 0x8b,
+	0x24, 0x4e, 0x2f, 0x76, 0x25, 0xbe, 0x1a, 0x9f, 0x0e, 0xd9, 0x8e, 0x81, 0x85, 0x29, 0xe7, 0xf7,
+	0xe7, 0xde, 0xe9, 0x05, 0xce, 0xb8, 0x6a, 0x1a, 0xd6, 0x96, 0x7d, 0x6a, 0xba, 0x5a, 0xb1, 0x32,
+	0xe9, 0x50, 0x69, 0x45, 0xce, 0x39, 0x4f, 0x18, 0x96, 0x46, 0xb6, 0x2a, 0xe1, 0xb5, 0x4c, 0x82,
+	0xea, 0xe2, 0x47, 0x6f, 0x07, 0xd5, 0x7a, 0xfd, 0xea, 0x73, 0x04, 0xf1, 0x8b, 0x5b, 0x90, 0x89,
+	0x03, 0xb9, 0x83, 0x99, 0x6c, 0x7b, 0xcd, 0x5a, 0x2e, 0x68, 0xb4, 0x8c, 0xd6, 0xf3, 0xdb, 0xeb,
+	0xe4, 0x8f, 0x85, 0xc9, 0xc3, 0x20, 0xcc, 0xbe, 0x2d, 0x84, 0xc0, 0x78, 0x7f, 0x28, 0x5a, 0x3a,
+	0x5a, 0x46, 0xeb, 0x38, 0x73, 0x33, 0xb9, 0x82, 0x79, 0xff, 0x2e, 0x34, 0xaf, 0xf2, 0x8e, 0xe9,
+	0x8a, 0xfe, 0x73, 0x14, 0x78, 0xe8, 0x89, 0xe9, 0xca, 0x9a, 0x3a, 0x85, 0x9a, 0x8e, 0xbd, 0xc9,
+	0xce, 0x84, 0xc2, 0xf4, 0x28, 0xb0, 0x50, 0xbd, 0xa0, 0xff, 0x97, 0xd1, 0x7a, 0x96, 0x85, 0x27,
+	0x59, 0xc0, 0xe4, 0x28, 0x50, 0xee, 0x3f, 0xe8, 0xc4, 0x11, 0xc3, 0xcb, 0xc6, 0xc8, 0xc6, 0x7a,
+	0xf3, 0xbd, 0xac, 0x05, 0x9d, 0xfa, 0x18, 0x0f, 0xdd, 0xcb, 0x5a, 0x90, 0x4b, 0x80, 0xc2, 0xc8,
+	0xba, 0xf4, 0x67, 0xcc, 0x1c, 0x1f, 0x3b, 0xc4, 0x5d, 0xb1, 0x85, 0x45, 0xf0, 0xa3, 0x6a, 0xf2,
+	0x5f, 0xd2, 0xd8, 0xe5, 0x9c, 0x0e, 0xab, 0x50, 0x35, 0xbb, 0x60, 0x5a, 0x3d, 0x02, 0x84, 0xee,
+	0xfa, 0xce, 0x26, 0x28, 0xa3, 0xf3, 0x5e, 0xa3, 0x60, 0x8d, 0xab, 0xef, 0x24, 0x8b, 0x95, 0xd1,
+	0xcf, 0x0e, 0xb0, 0xb4, 0x40, 0x0c, 0xf4, 0xc8, 0xd3, 0x02, 0xd1, 0xd3, 0xbb, 0xcd, 0xeb, 0xcd,
+	0x9b, 0xd4, 0x95, 0x29, 0x6c, 0xc3, 0xe9, 0xd0, 0x78, 0xf8, 0x6e, 0x78, 0x2d, 0x53, 0xec, 0x78,
+	0x1a, 0xda, 0x2f, 0x26, 0xee, 0xf7, 0x6d, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x1b, 0xe3, 0x8b,
+	0xb7, 0x07, 0x02, 0x00, 0x00,
 }
diff --git a/rpc/commands/upload.proto b/rpc/commands/upload.proto
index ad5b747643c..f3efa73f091 100644
--- a/rpc/commands/upload.proto
+++ b/rpc/commands/upload.proto
@@ -29,6 +29,8 @@ message UploadReq {
 	bool verbose = 5;
 	bool verify = 6;
 	string import_file = 7;
+	string build_path = 8;
+	bool import_from_build_path = 9;
 }
 
 message UploadResp {
diff --git a/rpc/debug/debug.pb.go b/rpc/debug/debug.pb.go
index 6fb1f3c5ea6..b9fed489bfa 100644
--- a/rpc/debug/debug.pb.go
+++ b/rpc/debug/debug.pb.go
@@ -9,6 +9,8 @@ import (
 	commands "github.com/arduino/arduino-cli/rpc/commands"
 	proto "github.com/golang/protobuf/proto"
 	grpc "google.golang.org/grpc"
+	codes "google.golang.org/grpc/codes"
+	status "google.golang.org/grpc/status"
 	math "math"
 )
 
@@ -261,11 +263,11 @@ var fileDescriptor_5ae24eab94cb53d5 = []byte{
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
-var _ grpc.ClientConn
+var _ grpc.ClientConnInterface
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion4
+const _ = grpc.SupportPackageIsVersion6
 
 // DebugClient is the client API for Debug service.
 //
@@ -275,10 +277,10 @@ type DebugClient interface {
 }
 
 type debugClient struct {
-	cc *grpc.ClientConn
+	cc grpc.ClientConnInterface
 }
 
-func NewDebugClient(cc *grpc.ClientConn) DebugClient {
+func NewDebugClient(cc grpc.ClientConnInterface) DebugClient {
 	return &debugClient{cc}
 }
 
@@ -318,6 +320,14 @@ type DebugServer interface {
 	Debug(Debug_DebugServer) error
 }
 
+// UnimplementedDebugServer can be embedded to have forward compatible implementations.
+type UnimplementedDebugServer struct {
+}
+
+func (*UnimplementedDebugServer) Debug(srv Debug_DebugServer) error {
+	return status.Errorf(codes.Unimplemented, "method Debug not implemented")
+}
+
 func RegisterDebugServer(s *grpc.Server, srv DebugServer) {
 	s.RegisterService(&_Debug_serviceDesc, srv)
 }
diff --git a/rpc/monitor/monitor.pb.go b/rpc/monitor/monitor.pb.go
index 78238c1565a..1a06ba48521 100644
--- a/rpc/monitor/monitor.pb.go
+++ b/rpc/monitor/monitor.pb.go
@@ -9,6 +9,8 @@ import (
 	proto "github.com/golang/protobuf/proto"
 	_struct "github.com/golang/protobuf/ptypes/struct"
 	grpc "google.golang.org/grpc"
+	codes "google.golang.org/grpc/codes"
+	status "google.golang.org/grpc/status"
 	math "math"
 )
 
@@ -266,11 +268,11 @@ var fileDescriptor_94d5950496a7550d = []byte{
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
-var _ grpc.ClientConn
+var _ grpc.ClientConnInterface
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion4
+const _ = grpc.SupportPackageIsVersion6
 
 // MonitorClient is the client API for Monitor service.
 //
@@ -280,10 +282,10 @@ type MonitorClient interface {
 }
 
 type monitorClient struct {
-	cc *grpc.ClientConn
+	cc grpc.ClientConnInterface
 }
 
-func NewMonitorClient(cc *grpc.ClientConn) MonitorClient {
+func NewMonitorClient(cc grpc.ClientConnInterface) MonitorClient {
 	return &monitorClient{cc}
 }
 
@@ -323,6 +325,14 @@ type MonitorServer interface {
 	StreamingOpen(Monitor_StreamingOpenServer) error
 }
 
+// UnimplementedMonitorServer can be embedded to have forward compatible implementations.
+type UnimplementedMonitorServer struct {
+}
+
+func (*UnimplementedMonitorServer) StreamingOpen(srv Monitor_StreamingOpenServer) error {
+	return status.Errorf(codes.Unimplemented, "method StreamingOpen not implemented")
+}
+
 func RegisterMonitorServer(s *grpc.Server, srv MonitorServer) {
 	s.RegisterService(&_Monitor_serviceDesc, srv)
 }
diff --git a/rpc/settings/settings.pb.go b/rpc/settings/settings.pb.go
index 1bbc54f255d..0537c7d9e3a 100644
--- a/rpc/settings/settings.pb.go
+++ b/rpc/settings/settings.pb.go
@@ -8,6 +8,8 @@ import (
 	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
 	grpc "google.golang.org/grpc"
+	codes "google.golang.org/grpc/codes"
+	status "google.golang.org/grpc/status"
 	math "math"
 )
 
@@ -275,11 +277,11 @@ var fileDescriptor_a4bfd59e429426d0 = []byte{
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
-var _ grpc.ClientConn
+var _ grpc.ClientConnInterface
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion4
+const _ = grpc.SupportPackageIsVersion6
 
 // SettingsClient is the client API for Settings service.
 //
@@ -292,10 +294,10 @@ type SettingsClient interface {
 }
 
 type settingsClient struct {
-	cc *grpc.ClientConn
+	cc grpc.ClientConnInterface
 }
 
-func NewSettingsClient(cc *grpc.ClientConn) SettingsClient {
+func NewSettingsClient(cc grpc.ClientConnInterface) SettingsClient {
 	return &settingsClient{cc}
 }
 
@@ -343,6 +345,23 @@ type SettingsServer interface {
 	SetValue(context.Context, *Value) (*SetValueResponse, error)
 }
 
+// UnimplementedSettingsServer can be embedded to have forward compatible implementations.
+type UnimplementedSettingsServer struct {
+}
+
+func (*UnimplementedSettingsServer) GetAll(ctx context.Context, req *GetAllRequest) (*RawData, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetAll not implemented")
+}
+func (*UnimplementedSettingsServer) Merge(ctx context.Context, req *RawData) (*MergeResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method Merge not implemented")
+}
+func (*UnimplementedSettingsServer) GetValue(ctx context.Context, req *GetValueRequest) (*Value, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetValue not implemented")
+}
+func (*UnimplementedSettingsServer) SetValue(ctx context.Context, req *Value) (*SetValueResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method SetValue not implemented")
+}
+
 func RegisterSettingsServer(s *grpc.Server, srv SettingsServer) {
 	s.RegisterService(&_Settings_serviceDesc, srv)
 }