diff --git a/.github/scripts/on-release.sh b/.github/scripts/on-release.sh
index 773f485b187..9cf04f119de 100755
--- a/.github/scripts/on-release.sh
+++ b/.github/scripts/on-release.sh
@@ -326,15 +326,15 @@ if [ "$RELEASE_PRE" == "false" ]; then
     fi
 fi
 
-# Upload package JSONs
+# Upload package JSONs (temporary halted, until json generation is fixed)
 echo "Uploading $PACKAGE_JSON_DEV ..."
 echo "Download URL: "`git_safe_upload_asset "$OUTPUT_DIR/$PACKAGE_JSON_DEV"`
-echo "Pages URL: "`git_safe_upload_to_pages "$PACKAGE_JSON_DEV" "$OUTPUT_DIR/$PACKAGE_JSON_DEV"`
+# echo "Pages URL: "`git_safe_upload_to_pages "$PACKAGE_JSON_DEV" "$OUTPUT_DIR/$PACKAGE_JSON_DEV"`
 echo
 if [ "$RELEASE_PRE" == "false" ]; then
     echo "Uploading $PACKAGE_JSON_REL ..."
     echo "Download URL: "`git_safe_upload_asset "$OUTPUT_DIR/$PACKAGE_JSON_REL"`
-    echo "Pages URL: "`git_safe_upload_to_pages "$PACKAGE_JSON_REL" "$OUTPUT_DIR/$PACKAGE_JSON_REL"`
+    # echo "Pages URL: "`git_safe_upload_to_pages "$PACKAGE_JSON_REL" "$OUTPUT_DIR/$PACKAGE_JSON_REL"`
     echo
 fi
 
diff --git a/cores/esp32/HardwareSerial.cpp b/cores/esp32/HardwareSerial.cpp
index efb974fe038..136876d143e 100644
--- a/cores/esp32/HardwareSerial.cpp
+++ b/cores/esp32/HardwareSerial.cpp
@@ -244,19 +244,19 @@ void HardwareSerial::_uartEventTask(void *args)
                         currentErr = UART_BUFFER_FULL_ERROR;
                         break;
                     case UART_BREAK:
-                        log_w("UART%d RX break.", uart->_uart_nr);
+                        log_v("UART%d RX break.", uart->_uart_nr);
                         currentErr = UART_BREAK_ERROR;
                         break;
                     case UART_PARITY_ERR:
-                        log_w("UART%d parity error.", uart->_uart_nr);
+                        log_v("UART%d parity error.", uart->_uart_nr);
                         currentErr = UART_PARITY_ERROR;
                         break;
                     case UART_FRAME_ERR:
-                        log_w("UART%d frame error.", uart->_uart_nr);
+                        log_v("UART%d frame error.", uart->_uart_nr);
                         currentErr = UART_FRAME_ERROR;
                         break;
                     default:
-                        log_w("UART%d unknown event type %d.", uart->_uart_nr, event.type);
+                        log_v("UART%d unknown event type %d.", uart->_uart_nr, event.type);
                         break;
                 }
                 if (currentErr != UART_NO_ERROR) {
diff --git a/cores/esp32/HardwareSerial.h b/cores/esp32/HardwareSerial.h
index c3ccf8d5c48..7df71c24381 100644
--- a/cores/esp32/HardwareSerial.h
+++ b/cores/esp32/HardwareSerial.h
@@ -135,13 +135,12 @@ typedef enum {
 #endif
 
 // Default pins for UART1 are arbitrary, and defined here for convenience.
-
 #if SOC_UART_NUM > 1
-  #ifndef RX1
+#ifndef RX1
     #if CONFIG_IDF_TARGET_ESP32
-      #define RX1 (gpio_num_t)26
+      #define RX1 (gpio_num_t)9
     #elif CONFIG_IDF_TARGET_ESP32S2
-      #define RX1 (gpio_num_t)4
+      #define RX1 (gpio_num_t)18
     #elif CONFIG_IDF_TARGET_ESP32C3
       #define RX1 (gpio_num_t)18
     #elif CONFIG_IDF_TARGET_ESP32S3
@@ -151,9 +150,9 @@ typedef enum {
 
   #ifndef TX1
     #if CONFIG_IDF_TARGET_ESP32
-      #define TX1 (gpio_num_t)27
+      #define TX1 (gpio_num_t)10
     #elif CONFIG_IDF_TARGET_ESP32S2
-      #define TX1 (gpio_num_t)5
+      #define TX1 (gpio_num_t)17
     #elif CONFIG_IDF_TARGET_ESP32C3
       #define TX1 (gpio_num_t)19
     #elif CONFIG_IDF_TARGET_ESP32S3
@@ -167,7 +166,7 @@ typedef enum {
 #if SOC_UART_NUM > 2
   #ifndef RX2
     #if CONFIG_IDF_TARGET_ESP32
-      #define RX2 (gpio_num_t)4
+      #define RX2 (gpio_num_t)16
     #elif CONFIG_IDF_TARGET_ESP32S3
       #define RX2 (gpio_num_t)19
     #endif
@@ -175,7 +174,7 @@ typedef enum {
 
   #ifndef TX2
     #if CONFIG_IDF_TARGET_ESP32
-      #define TX2 (gpio_num_t)25
+      #define TX2 (gpio_num_t)17
     #elif CONFIG_IDF_TARGET_ESP32S3
       #define TX2 (gpio_num_t)20
     #endif
diff --git a/cores/esp32/esp32-hal-uart.c b/cores/esp32/esp32-hal-uart.c
index 35573370902..5cb4e573092 100644
--- a/cores/esp32/esp32-hal-uart.c
+++ b/cores/esp32/esp32-hal-uart.c
@@ -301,7 +301,7 @@ bool uartSetHwFlowCtrlMode(uart_t *uart, uart_hw_flowcontrol_t mode, uint8_t thr
 }
 
 // This helper function will return true if a new IDF UART driver needs to be restarted and false if the current one can continue its execution
-bool _testUartBegin(uint8_t uart_nr, uint32_t baudrate, uint32_t config, int8_t rxPin, int8_t txPin, uint16_t rx_buffer_size, uint16_t tx_buffer_size, bool inverted, uint8_t rxfifo_full_thrhd)
+bool _testUartBegin(uint8_t uart_nr, uint32_t baudrate, uint32_t config, int8_t rxPin, int8_t txPin, uint32_t rx_buffer_size, uint32_t tx_buffer_size, bool inverted, uint8_t rxfifo_full_thrhd)
 {
     if(uart_nr >= SOC_UART_NUM) {
         return false;  // no new driver has to be installed
@@ -320,7 +320,7 @@ bool _testUartBegin(uint8_t uart_nr, uint32_t baudrate, uint32_t config, int8_t
     }
 }
 
-uart_t* uartBegin(uint8_t uart_nr, uint32_t baudrate, uint32_t config, int8_t rxPin, int8_t txPin, uint16_t rx_buffer_size, uint16_t tx_buffer_size, bool inverted, uint8_t rxfifo_full_thrhd)
+uart_t* uartBegin(uint8_t uart_nr, uint32_t baudrate, uint32_t config, int8_t rxPin, int8_t txPin, uint32_t rx_buffer_size, uint32_t tx_buffer_size, bool inverted, uint8_t rxfifo_full_thrhd)
 {
     if(uart_nr >= SOC_UART_NUM) {
         log_e("UART number is invalid, please use number from 0 to %u", SOC_UART_NUM - 1);
diff --git a/cores/esp32/esp32-hal-uart.h b/cores/esp32/esp32-hal-uart.h
index 12da8c8cd84..6427f56d06a 100644
--- a/cores/esp32/esp32-hal-uart.h
+++ b/cores/esp32/esp32-hal-uart.h
@@ -29,8 +29,8 @@ extern "C" {
 struct uart_struct_t;
 typedef struct uart_struct_t uart_t;
 
-bool _testUartBegin(uint8_t uart_nr, uint32_t baudrate, uint32_t config, int8_t rxPin, int8_t txPin, uint16_t rx_buffer_size, uint16_t tx_buffer_size, bool inverted, uint8_t rxfifo_full_thrhd);
-uart_t* uartBegin(uint8_t uart_nr, uint32_t baudrate, uint32_t config, int8_t rxPin, int8_t txPin, uint16_t rx_buffer_size, uint16_t tx_buffer_size, bool inverted, uint8_t rxfifo_full_thrhd);
+bool _testUartBegin(uint8_t uart_nr, uint32_t baudrate, uint32_t config, int8_t rxPin, int8_t txPin, uint32_t rx_buffer_size, uint32_t tx_buffer_size, bool inverted, uint8_t rxfifo_full_thrhd);
+uart_t* uartBegin(uint8_t uart_nr, uint32_t baudrate, uint32_t config, int8_t rxPin, int8_t txPin, uint32_t rx_buffer_size, uint32_t tx_buffer_size, bool inverted, uint8_t rxfifo_full_thrhd);
 void uartEnd(uint8_t uart_num);
 
 // This is used to retrieve the Event Queue pointer from a UART IDF Driver in order to allow user to deal with its events
diff --git a/cores/esp32/esp_arduino_version.h b/cores/esp32/esp_arduino_version.h
index c68c6222988..e103758508a 100644
--- a/cores/esp32/esp_arduino_version.h
+++ b/cores/esp32/esp_arduino_version.h
@@ -23,7 +23,7 @@ extern "C" {
 /** Minor version number (x.X.x) */
 #define ESP_ARDUINO_VERSION_MINOR   0
 /** Patch version number (x.x.X) */
-#define ESP_ARDUINO_VERSION_PATCH   15
+#define ESP_ARDUINO_VERSION_PATCH   16
 
 /**
  * Macro to convert ARDUINO version number into an integer
diff --git a/package.json b/package.json
index 7b0a84a9c3b..a9e2cdc44e7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "framework-arduinoespressif32",
-  "version": "2.0.15",
+  "version": "2.0.16",
   "description": "Arduino Wiring-based Framework for the Espressif ESP32, ESP32-S and ESP32-C series of SoCs",
   "keywords": [
     "framework",
diff --git a/platform.txt b/platform.txt
index bb55e752d8f..01ec563b0dd 100644
--- a/platform.txt
+++ b/platform.txt
@@ -1,5 +1,5 @@
 name=ESP32 Arduino
-version=2.0.15
+version=2.0.16
 
 tools.xtensa-esp32-elf-gcc.path={runtime.platform.path}/tools/xtensa-esp32-elf
 tools.xtensa-esp32s2-elf-gcc.path={runtime.platform.path}/tools/xtensa-esp32s2-elf