From 6826c60e48e59862e38566ae8357d0bb0cfc0514 Mon Sep 17 00:00:00 2001
From: JonnyOThan <jonnyothan@gmail.com>
Date: Tue, 30 Jan 2024 12:51:51 -0500
Subject: [PATCH] Merge master -> dev (#187)

* zh-cn localization for ManufacturerFixes.cfg (#178)

* Remove ENABLE_PROFILER define that got added recently

---------

Co-authored-by: zhangyuesai <zhangyuesai@live.com>