Merge remote-tracking branch 'origin/Hellen_fork_point' into master

# Conflicts:
#	firmware/controllers/algo/engine.cpp

firmware/controllers/bench_test.cpp

@@ -262,9 +262,9 @@ static void handleCommandX14(uint16_t index) {
 		return;
 	case 0xA:
 		// cmd_write_config
-#if EFI_PROD_CODE
+#if EFI_INTERNAL_FLASH
 		writeToFlashNow();
-#endif /* EFI_PROD_CODE */
+#endif /* EFI_INTERNAL_FLASH */
 		return;
 	case 0xB:
 		starterRelayBench();