diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06debe65c..8ffe2e66f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,31 +1,11 @@
 ## New changes
-* NFC: Add manually MF Classic with custom UID (by @gid9798 | PR #571)
-* Infrared: Fix crash when frequency is outside of supported range, allow sending broken files by setting frequency to nearest border
-* Infrared: Updated AC universal asset (Legion LE-F30RH-IN added and other changes) (by @Leptopt1los | PR #577)
-* SubGHz: Fix Somfy Telis wrong frequency in add manually
-* SubGHz: Fix frequency out of bounds check causing crash/freeze
-* RGB Patch: Fix colors
-* Builds: New build (clean) `c` - comes only with main apps, use in case you don't want preinstalled apps pack
-* Plugins: Moved into one repo - https://github.com/xMasterX/all-the-plugins
-* OFW PR 2984: (only buffer changes was merged, other will be later) SubGhz: fix todo (by Skorpionm)
-* OFW PR 2980: Properly reset the NFC device data (by Astrrra)
-* OFW: SubGhz: add timeout to subghz_hal_async_tx_test_run 
-* OFW: Improve vscode clangd experience
-* OFW: Add the Sad song animation
-* OFW: ufbt: fixed FAP_SRC_DIR
-* OFW: UI: Clock on Desktop -> Refactoring of our desktop clock
-* OFW: uFBT: devboard_flash to update WiFi devboard 
-* OFW: FBT: devboard_flash to update WiFi devboard
-* OFW: Scripts: OB recovery
-* OFW: Expose additional functions of the crypto engine to user -> **Breaking API change 34.x -> 35.x**
-* OFW: External apps removed -> In our case - moved into extra plugins repo to separate plugins and firmware
-* OFW: BadUSB: qFlipper install script for MacOS
-* OFW: Add compressor.h to the SDK
-* OFW: fbt: Fix building using path with space
-* OFW: RPC: md5 in storage list
-* OFW: Fixes 2957 - subghz decode_raw
-* OFW: FDX-B temperature in system units
-* OFW: Infrared: buttons move feature rework
+* !!! **Warning! After installing, Desktop settings (Favoutite apps, PIN Code, AutoLock time..) will be resetted to default due to settings changes, Please set your PIN code, Favourite apps again in Settings->Desktop** !!!
+* Desktop: **New way to set favourite apps and fully configurable dummy mode** (now you can set up to 4 favourite apps!) (port of OFW PR 2972 by nminaylov) (by @gid9798 | PR #578)
+* Desktop: Fix lock timer after rebooting (by @gid9798 | PR #578)
+* Infrared: Updated universal assets (by @amec0e | PR #581)
+* Core: Added proper error message on out of memory crash (by @Willy-JL)
+* SubGHz: Fix FAAC SLH add manually issues and fix sending signals with unknown seed
+* SubGHz: Temporarily reverted changes from OFW PR 2984: SubGhz: fix todo (by Skorpionm) - Fixes Enhanced Sub-GHz Chat app and various issues related to receiving signals that was found in 061 release
 
 ----
 
@@ -34,17 +14,19 @@
 [-> Download qFlipper (official link)](https://flipperzero.one/update)
 
 ## Please support development of the project
-* **Boosty** (patreon alternative): https://boosty.to/mmxdev
-* cloudtips (only RU payments accepted): https://pay.cloudtips.ru/p/7b3e9d65
-* YooMoney (only RU payments accepted): https://yoomoney.ru/fundraise/XA49mgQLPA0.221209
-* USDT(TRC20): `TSXcitMSnWXUFqiUfEXrTVpVewXy2cYhrs`
-* BCH: `qquxfyzntuqufy2dx0hrfr4sndp0tucvky4sw8qyu3`
-* ETH/BSC/ERC20-Tokens: `darkflippers.eth` (or `0xFebF1bBc8229418FF2408C07AF6Afa49152fEc6a`)
-* BTC: `bc1q0np836jk9jwr4dd7p6qv66d04vamtqkxrecck9`
-* DOGE: `D6R6gYgBn5LwTNmPyvAQR6bZ9EtGgFCpvv`
-* LTC: `ltc1q3ex4ejkl0xpx3znwrmth4lyuadr5qgv8tmq8z9`
-* XMR (Monero): `41xUz92suUu1u5Mu4qkrcs52gtfpu9rnZRdBpCJ244KRHf6xXSvVFevdf2cnjS7RAeYr5hn9MsEfxKoFDRSctFjG5fv1Mhn`
-* TON: `EQCOqcnYkvzOZUV_9bPE_8oTbOrOF03MnF-VcJyjisTZmpGf`
+|Service|Remark|Link/Wallet|
+|-|-|-|
+|**Boosty**|patreon alternative|https://boosty.to/mmxdev|
+|cloudtips|only RU payments accepted|https://pay.cloudtips.ru/p/7b3e9d65|
+|YooMoney|only RU payments accepted|https://yoomoney.ru/fundraise/XA49mgQLPA0.221209|
+|USDT|(TRC20)|`TSXcitMSnWXUFqiUfEXrTVpVewXy2cYhrs`|
+|BCH||`qquxfyzntuqufy2dx0hrfr4sndp0tucvky4sw8qyu3`|
+|ETH|(BSC/ERC20-Tokens)|`darkflippers.eth` (or `0xFebF1bBc8229418FF2408C07AF6Afa49152fEc6a`)|
+|BTC||`bc1q0np836jk9jwr4dd7p6qv66d04vamtqkxrecck9`|
+|DOGE||`D6R6gYgBn5LwTNmPyvAQR6bZ9EtGgFCpvv`|
+|LTC||`ltc1q3ex4ejkl0xpx3znwrmth4lyuadr5qgv8tmq8z9`|
+|XMR|(Monero)| `41xUz92suUu1u5Mu4qkrcs52gtfpu9rnZRdBpCJ244KRHf6xXSvVFevdf2cnjS7RAeYr5hn9MsEfxKoFDRSctFjG5fv1Mhn`|
+|TON||`EQCOqcnYkvzOZUV_9bPE_8oTbOrOF03MnF-VcJyjisTZmpGf`|
 
 #### Thanks to our sponsors:
 callmezimbra, Quen0n, MERRON, grvpvl (lvpvrg), art_col, ThurstonWaffles, Moneron, UterGrooll, LUCFER, Northpirate, zloepuzo, T.Rat, Alexey B., ionelife, ...
@@ -59,10 +41,10 @@ What build I should download and what this name means - `flipper-z-f7-update-(ve
 `f7` = Hardware version - same for all flipper zero devices<br>
 `update` = Update package, contains updater, all assets (plugins, IR libs, etc.), and firmware itself<br>
 `(version)` = Firmware version<br>
-` ` = this build comes with 3 custom animations, and default apps preinstalled<br>
-`c` = this build comes with 3 custom animations, and only main apps (Clean build)<br>
-`n` = this build comes without our custom animations (we have only 3 of them), only official flipper animations<br>
-`e` = build has 🎲 [extra apps pack](https://github.com/xMasterX/all-the-plugins) preinstalled<br>
+` ` = this build comes with 3 custom animations, and default apps preinstalled (base pack)<br>
+`c` = this build comes with 3 custom animations, and only main apps (Clean build like latest OFW)<br>
+`n` = this build comes without our custom animations (we have only 3 of them), only official flipper animations, and base pack apps<br>
+`e` = build has 🎲 [extra apps pack](https://github.com/xMasterX/all-the-plugins) preinstalled, our custom animations, and base pack apps too<br>
 `r` = RGB patch (+ extra apps) for flippers with rgb backlight mod (this is hardware mod!) (Works only on modded flippers!) (do not install on non modded device!)
 
 Firmware Self-update package (update from microSD) - `flipper-z-f7-update-(version).tgz` for mobile app / qFlipper / web<br>
diff --git a/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c b/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c
index 975a3b9b6..52e776959 100644
--- a/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c
+++ b/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c
@@ -147,15 +147,15 @@ void desktop_settings_scene_start_on_enter(void* context) {
     variable_item_list_add(variable_item_list, "Favorite App - Right Short", 1, NULL, NULL);
     variable_item_list_add(variable_item_list, "Favorite App - Right Long", 1, NULL, NULL);
 
-    variable_item_list_add(variable_item_list, "DummyMode App - Left", 1, NULL, NULL);
-    variable_item_list_add(variable_item_list, "DummyMode App - Left Long", 1, NULL, NULL);
-    variable_item_list_add(variable_item_list, "DummyMode App - Right", 1, NULL, NULL);
-    variable_item_list_add(variable_item_list, "DummyMode App - Right Long", 1, NULL, NULL);
-    variable_item_list_add(variable_item_list, "DummyMode App - Up Long", 1, NULL, NULL);
-    variable_item_list_add(variable_item_list, "DummyMode App - Down", 1, NULL, NULL);
-    variable_item_list_add(variable_item_list, "DummyMode App - Down Long", 1, NULL, NULL);
-    variable_item_list_add(variable_item_list, "DummyMode App - Ok", 1, NULL, NULL);
-    variable_item_list_add(variable_item_list, "DummyMode App - Ok Long", 1, NULL, NULL);
+    variable_item_list_add(variable_item_list, "DummyMode - Left", 1, NULL, NULL);
+    variable_item_list_add(variable_item_list, "DummyMode - Left Long", 1, NULL, NULL);
+    variable_item_list_add(variable_item_list, "DummyMode - Right", 1, NULL, NULL);
+    variable_item_list_add(variable_item_list, "DummyMode - Right Long", 1, NULL, NULL);
+    variable_item_list_add(variable_item_list, "DummyMode - Up Long", 1, NULL, NULL);
+    variable_item_list_add(variable_item_list, "DummyMode - Down", 1, NULL, NULL);
+    variable_item_list_add(variable_item_list, "DummyMode - Down Long", 1, NULL, NULL);
+    variable_item_list_add(variable_item_list, "DummyMode - Ok", 1, NULL, NULL);
+    variable_item_list_add(variable_item_list, "DummyMode - Ok Long", 1, NULL, NULL);
 
     variable_item_list_set_enter_callback(
         variable_item_list, desktop_settings_scene_start_var_list_enter_callback, app);
diff --git a/furi/core/memmgr_heap.c b/furi/core/memmgr_heap.c
index ca206cd39..3b4fdafa0 100644
--- a/furi/core/memmgr_heap.c
+++ b/furi/core/memmgr_heap.c
@@ -481,7 +481,7 @@ void* pvPortMalloc(size_t xWantedSize) {
 
     configASSERT((((size_t)pvReturn) & (size_t)portBYTE_ALIGNMENT_MASK) == 0);
 
-    furi_check(pvReturn);
+    furi_check(pvReturn, "out of memory");
     pvReturn = memset(pvReturn, 0, to_wipe);
     return pvReturn;
 }