Merge remote-tracking branch 'ofw/dev' into mntm-dev

lib/SConscript

@@ -4,7 +4,7 @@ Import("env")
 env.Append(
     CPPPATH=[
         "#/",
-        "#/lib",  # TODO FL-3553: remove!
+        "#/lib",
         # Ugly hack
         Dir("../assets/compiled"),
         Dir("../../icons"),

lib/toolbox/tar/tar_archive.c

@@ -100,7 +100,6 @@ static int mtar_compressed_file_close(void* stream) {
             compress_stream_decoder_free(compressed_stream->decoder);
         }
         storage_file_close(compressed_stream->stream);
-        storage_file_free(compressed_stream->stream);
         free(compressed_stream);
     }
     return MTAR_ESUCCESS;

scripts/ufbt/commandline.scons

@@ -93,6 +93,11 @@ vars.AddVariables(
         help="Enable strict import check for .faps",
         default=True,
     ),
+    (
+        "ARGS",
+        "Extra arguments to pass to certain scripts supporting it",
+        "",
+    ),
 )
 
 Return("vars")