diff --git a/firmware/console/binary/tunerstudio_io.cpp b/firmware/console/binary/tunerstudio_io.cpp
index f56a5318d4..9a6111ea5a 100644
--- a/firmware/console/binary/tunerstudio_io.cpp
+++ b/firmware/console/binary/tunerstudio_io.cpp
@@ -102,6 +102,10 @@ void startTsPort(ts_channel_s *tsChannel) {
 			if (CONFIGB(useSerialPort)) {
 
 				print("TunerStudio over USART");
+				/**
+				 * We have hard-coded USB serial console so that it would be clear how to connect to each specific board,
+				 * but for UART serial we allow users to change settings.
+				 */
 				efiSetPadMode("tunerstudio rx", engineConfiguration->binarySerialRxPin, PAL_MODE_ALTERNATE(TS_SERIAL_AF));
 				efiSetPadMode("tunerstudio tx", engineConfiguration->binarySerialTxPin, PAL_MODE_ALTERNATE(TS_SERIAL_AF));
 
diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp
index 8acf91751d..202abfe541 100644
--- a/firmware/controllers/engine_controller.cpp
+++ b/firmware/controllers/engine_controller.cpp
@@ -819,6 +819,6 @@ int getRusEfiVersion(void) {
 	if (initBootloader() != 0)
 		return 123;
 #endif /* EFI_BOOTLOADER_INCLUDE_CODE */
-	return 20191202;
+	return 20191206;
 }
 #endif /* EFI_UNIT_TEST */
diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini
index 2275986447..9e36b5d9f3 100644
--- a/firmware/tunerstudio/rusefi.ini
+++ b/firmware/tunerstudio/rusefi.ini
@@ -85,7 +85,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Dec 04 00:37:59 EST 2019
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Dec 07 21:20:32 EST 2019
 
 pageSize            = 20000
 page = 1
@@ -3215,7 +3215,9 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 ;			Board->Connection
 	dialog = tsPort, "TunerStudio Port"
 		field = "tunerStudioSerialSpeed",				tunerStudioSerialSpeed
-		field = "Use PC10/PC11 serial?",				useSerialPort
+		field = "Use UART/TTL serial?",					useSerialPort
+		field = "RX pin",                               binarySerialRxPin, {useSerialPort == 1}
+		field = "TX pin",                               binarySerialTxPin, {useSerialPort == 1}
 		field = "uartConsoleSerialSpeed",				uartConsoleSerialSpeed
 		
 	dialog = canBus, "CAN Bus"
diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input
index 5ab872d64d..2d4638cf79 100644
--- a/firmware/tunerstudio/rusefi.input
+++ b/firmware/tunerstudio/rusefi.input
@@ -2191,7 +2191,7 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 ;			Board->Connection
 	dialog = tsPort, "TunerStudio Port"
 		field = "tunerStudioSerialSpeed",				tunerStudioSerialSpeed
-		field = "Use PC10/PC11 serial?",				useSerialPort
+		field = "Use UART/TTL serial?",					useSerialPort
 		field = "RX pin",                               binarySerialRxPin, {useSerialPort == 1}
 		field = "TX pin",                               binarySerialTxPin, {useSerialPort == 1}
 		field = "uartConsoleSerialSpeed",				uartConsoleSerialSpeed
diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini
index 83242fb5fa..556e749acf 100644
--- a/firmware/tunerstudio/rusefi_frankenso.ini
+++ b/firmware/tunerstudio/rusefi_frankenso.ini
@@ -85,7 +85,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Dec 04 00:38:05 EST 2019
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Dec 07 21:20:38 EST 2019
 
 pageSize            = 20000
 page = 1
@@ -3215,7 +3215,9 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 ;			Board->Connection
 	dialog = tsPort, "TunerStudio Port"
 		field = "tunerStudioSerialSpeed",				tunerStudioSerialSpeed
-		field = "Use PC10/PC11 serial?",				useSerialPort
+		field = "Use UART/TTL serial?",					useSerialPort
+		field = "RX pin",                               binarySerialRxPin, {useSerialPort == 1}
+		field = "TX pin",                               binarySerialTxPin, {useSerialPort == 1}
 		field = "uartConsoleSerialSpeed",				uartConsoleSerialSpeed
 		
 	dialog = canBus, "CAN Bus"
diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini
index 8a967633c2..ab3a14bbc2 100644
--- a/firmware/tunerstudio/rusefi_microrusefi.ini
+++ b/firmware/tunerstudio/rusefi_microrusefi.ini
@@ -85,7 +85,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Dec 04 00:38:02 EST 2019
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Dec 07 21:20:35 EST 2019
 
 pageSize            = 20000
 page = 1
@@ -3199,7 +3199,9 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 ;			Board->Connection
 	dialog = tsPort, "TunerStudio Port"
 		field = "tunerStudioSerialSpeed",				tunerStudioSerialSpeed
-		field = "Use PC10/PC11 serial?",				useSerialPort
+		field = "Use UART/TTL serial?",					useSerialPort
+		field = "RX pin",                               binarySerialRxPin, {useSerialPort == 1}
+		field = "TX pin",                               binarySerialTxPin, {useSerialPort == 1}
 		field = "uartConsoleSerialSpeed",				uartConsoleSerialSpeed
 		
 	dialog = canBus, "CAN Bus"
diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini
index 1d5969f383..5d464da3e2 100644
--- a/firmware/tunerstudio/rusefi_prometheus.ini
+++ b/firmware/tunerstudio/rusefi_prometheus.ini
@@ -85,7 +85,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Dec 04 00:38:08 EST 2019
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Dec 07 21:20:41 EST 2019
 
 pageSize            = 20000
 page = 1
@@ -3211,7 +3211,9 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 ;			Board->Connection
 	dialog = tsPort, "TunerStudio Port"
 		field = "tunerStudioSerialSpeed",				tunerStudioSerialSpeed
-		field = "Use PC10/PC11 serial?",				useSerialPort
+		field = "Use UART/TTL serial?",					useSerialPort
+		field = "RX pin",                               binarySerialRxPin, {useSerialPort == 1}
+		field = "TX pin",                               binarySerialTxPin, {useSerialPort == 1}
 		field = "uartConsoleSerialSpeed",				uartConsoleSerialSpeed
 		
 	dialog = canBus, "CAN Bus"