diff --git a/SConstruct b/SConstruct
index c8f8f45c0..248fcf1d1 100644
--- a/SConstruct
+++ b/SConstruct
@@ -185,6 +185,7 @@ fap_deploy = distenv.PhonyTarget(
     ],
     source=firmware_env.Dir(("${RESOURCES_ROOT}/apps")),
 )
+Depends(fap_deploy, firmware_env["FW_RESOURCES_MANIFEST"])
 
 
 # Target for bundling core2 package for qFlipper
diff --git a/applications/main/ibutton/ibutton_custom_event.h b/applications/main/ibutton/ibutton_custom_event.h
index 28bcb94a0..1ac50ee3c 100644
--- a/applications/main/ibutton/ibutton_custom_event.h
+++ b/applications/main/ibutton/ibutton_custom_event.h
@@ -1,6 +1,6 @@
 #pragma once
 
-enum iButtonCustomEvent {
+typedef enum {
     // Reserve first 100 events for button types and indexes, starting from 0
     iButtonCustomEventReserved = 100,
 
@@ -10,8 +10,12 @@ enum iButtonCustomEvent {
     iButtonCustomEventByteEditResult,
     iButtonCustomEventWorkerEmulated,
     iButtonCustomEventWorkerRead,
+    iButtonCustomEventWorkerWriteOK,
+    iButtonCustomEventWorkerWriteSameKey,
+    iButtonCustomEventWorkerWriteNoDetect,
+    iButtonCustomEventWorkerWriteCannotWrite,
 
     iButtonCustomEventRpcLoad,
     iButtonCustomEventRpcExit,
     iButtonCustomEventRpcSessionClose,
-};
+} iButtonCustomEvent;
diff --git a/applications/main/ibutton/scenes/ibutton_scene_write.c b/applications/main/ibutton/scenes/ibutton_scene_write.c
index 541aa1c52..63be63506 100644
--- a/applications/main/ibutton/scenes/ibutton_scene_write.c
+++ b/applications/main/ibutton/scenes/ibutton_scene_write.c
@@ -5,9 +5,26 @@ typedef enum {
     iButtonSceneWriteStateBlinkYellow,
 } iButtonSceneWriteState;
 
+static inline iButtonCustomEvent
+    ibutton_scene_write_to_custom_event(iButtonWorkerWriteResult result) {
+    switch(result) {
+    case iButtonWorkerWriteOK:
+        return iButtonCustomEventWorkerWriteOK;
+    case iButtonWorkerWriteSameKey:
+        return iButtonCustomEventWorkerWriteSameKey;
+    case iButtonWorkerWriteNoDetect:
+        return iButtonCustomEventWorkerWriteNoDetect;
+    case iButtonWorkerWriteCannotWrite:
+        return iButtonCustomEventWorkerWriteCannotWrite;
+    default:
+        furi_crash();
+    }
+}
+
 static void ibutton_scene_write_callback(void* context, iButtonWorkerWriteResult result) {
     iButton* ibutton = context;
-    view_dispatcher_send_custom_event(ibutton->view_dispatcher, result);
+    view_dispatcher_send_custom_event(
+        ibutton->view_dispatcher, ibutton_scene_write_to_custom_event(result));
 }
 
 void ibutton_scene_write_on_enter(void* context) {
@@ -61,16 +78,14 @@ bool ibutton_scene_write_on_event(void* context, SceneManagerEvent event) {
 
     if(event.type == SceneManagerEventTypeCustom) {
         consumed = true;
-        if((event.event == iButtonWorkerWriteOK) || (event.event == iButtonWorkerWriteSameKey)) {
+        if((event.event == iButtonCustomEventWorkerWriteOK) ||
+           (event.event == iButtonCustomEventWorkerWriteSameKey)) {
             scene_manager_next_scene(scene_manager, iButtonSceneWriteSuccess);
-        } else if(event.event == iButtonWorkerWriteNoDetect) {
+        } else if(event.event == iButtonCustomEventWorkerWriteNoDetect) {
             ibutton_notification_message(ibutton, iButtonNotificationMessageEmulateBlink);
-        } else if(event.event == iButtonWorkerWriteCannotWrite) {
+        } else if(event.event == iButtonCustomEventWorkerWriteCannotWrite) {
             ibutton_notification_message(ibutton, iButtonNotificationMessageYellowBlink);
         }
-
-    } else if(event.type == SceneManagerEventTypeTick) {
-        consumed = true;
     }
 
     return consumed;
diff --git a/scripts/fbt/appmanifest.py b/scripts/fbt/appmanifest.py
index 3a3640d42..bef4eb02b 100644
--- a/scripts/fbt/appmanifest.py
+++ b/scripts/fbt/appmanifest.py
@@ -240,12 +240,12 @@ class AppBuildset:
         FlipperAppType.SETTINGS,
         FlipperAppType.STARTUP,
     )
-    EXTERNAL_APP_TYPES = (
-        FlipperAppType.EXTERNAL,
-        FlipperAppType.MENUEXTERNAL,
-        FlipperAppType.PLUGIN,
-        FlipperAppType.DEBUG,
-    )
+    EXTERNAL_APP_TYPES_MAP = {
+        FlipperAppType.EXTERNAL: True,
+        FlipperAppType.PLUGIN: True,
+        FlipperAppType.DEBUG: True,
+        FlipperAppType.MENUEXTERNAL: False,
+    }
 
     @staticmethod
     def print_writer(message):
@@ -318,8 +318,8 @@ class AppBuildset:
     def _process_ext_apps(self):
         extapps = [
             app
-            for apptype in self.EXTERNAL_APP_TYPES
-            for app in self.get_apps_of_type(apptype, True)
+            for (apptype, global_lookup) in self.EXTERNAL_APP_TYPES_MAP.items()
+            for app in self.get_apps_of_type(apptype, global_lookup)
         ]
         extapps.extend(map(self.appmgr.get, self._extra_ext_appnames))
 
@@ -407,10 +407,14 @@ class AppBuildset:
         return sdk_headers
 
     def get_apps_of_type(self, apptype: FlipperAppType, all_known: bool = False):
+        """Looks up apps of given type in current app set. If all_known is true,
+        ignores app set and checks all loaded apps' manifests."""
         return sorted(
             filter(
                 lambda app: app.apptype == apptype,
-                self.appmgr.known_apps.values() if all_known else self._apps,
+                self.appmgr.known_apps.values()
+                if all_known
+                else map(self.appmgr.get, self.appnames),
             ),
             key=lambda app: app.order,
         )
diff --git a/scripts/fbt_tools/fbt_apps.py b/scripts/fbt_tools/fbt_apps.py
index 9a0718055..edce194f0 100644
--- a/scripts/fbt_tools/fbt_apps.py
+++ b/scripts/fbt_tools/fbt_apps.py
@@ -21,8 +21,13 @@ def LoadAppManifest(env, entry):
         APP_MANIFEST_NAME = "application.fam"
         manifest_glob = entry.glob(APP_MANIFEST_NAME)
         if len(manifest_glob) == 0:
+            try:
+                disk_node = next(filter(lambda d: d.exists(), entry.get_all_rdirs()))
+            except Exception:
+                disk_node = entry
+
             raise FlipperManifestException(
-                f"Folder {entry}: manifest {APP_MANIFEST_NAME} is missing"
+                f"App folder '{disk_node.abspath}': missing manifest ({APP_MANIFEST_NAME})"
             )
 
         app_manifest_file_path = manifest_glob[0].rfile().abspath
diff --git a/scripts/version.py b/scripts/version.py
index be1c51ce7..a37592137 100755
--- a/scripts/version.py
+++ b/scripts/version.py
@@ -53,7 +53,7 @@ class GitVersion:
             )
         else:
             commit_date = datetime.strptime(
-                self._exec_git("log -1 --format=%cd").strip(),
+                self._exec_git("log -1 --format=%cd --date=default").strip(),
                 "%a %b %d %H:%M:%S %Y %z",
             )