diff --git a/platformio/__init__.py b/platformio/__init__.py
index c5f65833..6b427762 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -14,7 +14,7 @@
 
 import sys
 
-VERSION = (2, 7, "0.dev6")
+VERSION = (2, 7, "0.dev7")
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"
diff --git a/platformio/builder/scripts/espressif.py b/platformio/builder/scripts/espressif.py
index 8bbe33d1..ea6cd75c 100644
--- a/platformio/builder/scripts/espressif.py
+++ b/platformio/builder/scripts/espressif.py
@@ -111,23 +111,23 @@ env.Replace(
         "-vv",
         "-cd", "${BOARD_OPTIONS['upload']['resetmethod']}",
         "-cb", "$UPLOAD_SPEED",
-        "-cp", "$UPLOAD_PORT",
-        "-cf", "$SOURCE"
+        "-cp", "$UPLOAD_PORT"
     ],
     UPLOADERFSFLAGS=[
         "$UPLOADERFLAGS",
+        "$UPLOAD_FLAGS",
         "-ca", "$SPIFFS_START"
     ],
     UPLOADEROTAFLAGS=[
         "--debug",
         "--progress",
         "-i", "$UPLOAD_PORT",
-        "-f", "$SOURCE"
+        "$UPLOAD_FLAGS"
     ],
 
-    UPLOADCMD='"$UPLOADER" $UPLOADERFLAGS',
-    UPLOADFSCMD='"$UPLOADER" $UPLOADERFSFLAGS',
-    UPLOADOTACMD='"$UPLOADEROTA" $UPLOADEROTAFLAGS',
+    UPLOADCMD='"$UPLOADER" $UPLOADERFLAGS -cf $SOURCE',
+    UPLOADFSCMD='"$UPLOADER" $UPLOADERFSFLAGS -cf $SOURCE',
+    UPLOADOTACMD='"$UPLOADEROTA" $UPLOADEROTAFLAGS -f $SOURCE',
 
     #
     # Misc
diff --git a/platformio/builder/scripts/nordicnrf51.py b/platformio/builder/scripts/nordicnrf51.py
index 2bf1f032..b631020b 100644
--- a/platformio/builder/scripts/nordicnrf51.py
+++ b/platformio/builder/scripts/nordicnrf51.py
@@ -32,8 +32,8 @@ if env.subst("$BOARD") == "rfduino":
     )
     env.Replace(
         UPLOADER=join("$PIOPACKAGES_DIR", "tool-rfdloader", "rfdloader"),
-        UPLOADERFLAGS=["-q", "$UPLOAD_PORT", "$SOURCES"],
-        UPLOADCMD='"$UPLOADER" $UPLOADERFLAGS'
+        UPLOADERFLAGS=["-q", "$UPLOAD_PORT"],
+        UPLOADCMD='"$UPLOADER" $UPLOADERFLAGS $SOURCES'
     )
 
 #