diff --git a/applications/services/cli/application.fam b/applications/services/cli/application.fam
index 6e0a28164..b305fb6b0 100644
--- a/applications/services/cli/application.fam
+++ b/applications/services/cli/application.fam
@@ -22,7 +22,7 @@ App(
     entry_point="cli_vcp_srv",
     stack_size=1024,
     order=10,
-    sdk_headers=["cli_vcp.h"],
+    sdk_headers=["cli_vcp.h", "cli.h"],
     sources=["cli_vcp.c"],
 )
 
diff --git a/applications/services/cli/cli.h b/applications/services/cli/cli.h
new file mode 100644
index 000000000..ca787d3db
--- /dev/null
+++ b/applications/services/cli/cli.h
@@ -0,0 +1,13 @@
+#pragma once
+
+/* 
+ * Compatibility header for ease of porting existing apps.
+ *  In short: 
+ *   Cli* is replaced with with CliRegistry*
+ *   cli_* functions are replaced with cli_registry_* functions
+ *   (i.e., cli_add_command() is now cli_registry_add_command())
+*/
+
+#include <toolbox/cli/cli_registry.h>
+
+#define RECORD_CLI "cli"
diff --git a/applications/services/cli/cli_main_commands.h b/applications/services/cli/cli_main_commands.h
index d8058f467..ebee4ba1e 100644
--- a/applications/services/cli/cli_main_commands.h
+++ b/applications/services/cli/cli_main_commands.h
@@ -1,9 +1,9 @@
 #pragma once
 
+#include "cli.h"
 #include <toolbox/cli/cli_command.h>
 #include <toolbox/cli/cli_registry.h>
 
-#define RECORD_CLI "cli"
-#define CLI_APPID  "cli"
+#define CLI_APPID "cli"
 
 void cli_main_commands_init(CliRegistry* registry);
diff --git a/scripts/fbt/appmanifest.py b/scripts/fbt/appmanifest.py
index 9b3b53b04..c46dffdbe 100644
--- a/scripts/fbt/appmanifest.py
+++ b/scripts/fbt/appmanifest.py
@@ -158,7 +158,7 @@ class AppManager:
                     f"App {kw.get('appid')} cannot have fal_embedded set"
                 )
 
-        if apptype in AppBuildset.dist_app_types:
+        if apptype in AppBuildset.DIST_APP_TYPES:
             # For distributing .fap's resources, there's "fap_file_assets"
             for app_property in ("resources",):
                 if kw.get(app_property):
@@ -261,14 +261,12 @@ class AppBuildset:
         FlipperAppType.DEBUG: True,
         FlipperAppType.MENUEXTERNAL: False,
     }
-
-    @classmethod
-    @property
-    def dist_app_types(cls):
-        """Applications that are installed on SD card"""
-        return list(
-            entry[0] for entry in cls.EXTERNAL_APP_TYPES_MAP.items() if entry[1]
-        )
+    DIST_APP_TYPES = list(
+        # Applications that are installed on SD card
+        entry[0]
+        for entry in EXTERNAL_APP_TYPES_MAP.items()
+        if entry[1]
+    )
 
     @staticmethod
     def print_writer(message):
diff --git a/targets/f18/api_symbols.csv b/targets/f18/api_symbols.csv
index 91d666922..3128fd412 100644
--- a/targets/f18/api_symbols.csv
+++ b/targets/f18/api_symbols.csv
@@ -1,7 +1,8 @@
 entry,status,name,type,params
-Version,+,85.0,,
+Version,+,86.0,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/bt/bt_service/bt_keys_storage.h,,
+Header,+,applications/services/cli/cli.h,,
 Header,+,applications/services/cli/cli_vcp.h,,
 Header,+,applications/services/dialogs/dialogs.h,,
 Header,+,applications/services/dolphin/dolphin.h,,
diff --git a/targets/f7/api_symbols.csv b/targets/f7/api_symbols.csv
index 60df2aeb1..af74003de 100755
--- a/targets/f7/api_symbols.csv
+++ b/targets/f7/api_symbols.csv
@@ -1,8 +1,9 @@
 entry,status,name,type,params
-Version,+,85.0,,
+Version,+,86.0,,
 Header,+,applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/bt/bt_service/bt_keys_storage.h,,
+Header,+,applications/services/cli/cli.h,,
 Header,+,applications/services/cli/cli_vcp.h,,
 Header,+,applications/services/dialogs/dialogs.h,,
 Header,+,applications/services/dolphin/dolphin.h,,