diff --git a/README.md b/README.md
index b14b38f3c..7a34de818 100644
--- a/README.md
+++ b/README.md
@@ -12,3 +12,4 @@ git clone https://github.com/espressif/esp32-arduino-lib-builder
 cd esp32-arduino-lib-builder
 ./build.sh
 ```
+
diff --git a/sdkconfig b/sdkconfig
index 89656389e..5acde6fc3 100644
--- a/sdkconfig
+++ b/sdkconfig
@@ -282,6 +282,11 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
 #
 CONFIG_CAN_ISR_IN_IRAM=
 
+#
+# UART configuration
+#
+CONFIG_UART_ISR_IN_IRAM=
+
 #
 # eFuse Bit Manager
 #
@@ -622,6 +627,7 @@ CONFIG_FREERTOS_ISR_STACKSIZE=1536
 CONFIG_FREERTOS_LEGACY_HOOKS=
 CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16
 CONFIG_SUPPORT_STATIC_ALLOCATION=y
+CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK=
 CONFIG_TIMER_TASK_PRIORITY=1
 CONFIG_TIMER_TASK_STACK_DEPTH=2048
 CONFIG_TIMER_QUEUE_LENGTH=10
@@ -936,6 +942,7 @@ CONFIG_UNITY_ENABLE_DOUBLE=y
 CONFIG_UNITY_ENABLE_COLOR=
 CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y
 CONFIG_UNITY_ENABLE_FIXTURE=
+CONFIG_UNITY_ENABLE_BACKTRACE_ON_FAIL=
 
 #
 # Virtual file system
diff --git a/tools/archive-build.sh b/tools/archive-build.sh
index cd1730c2b..2bb31172a 100755
--- a/tools/archive-build.sh
+++ b/tools/archive-build.sh
@@ -22,7 +22,7 @@ mkdir -p dist && rm -rf "$archive_path" "$build_archive_path"
 if [ -d "out" ]; then
     cd out
     echo "Creating framework-arduinoespressif32"
-    git clone https://github.com/espressif/arduino-esp32 -b idf-release/v3.3
+    git clone https://github.com/espressif/arduino-esp32 -b release/v1.0
     rm -rf arduino-esp32/tools/sdk
     rm -rf arduino-esp32/docs
     cp -Rf tools/sdk arduino-esp32/tools/sdk
diff --git a/tools/config.sh b/tools/config.sh
index 1d06a4ddf..a0a2ab2ff 100755
--- a/tools/config.sh
+++ b/tools/config.sh
@@ -12,6 +12,10 @@ if [ -z $IDF_BRANCH ]; then
 	IDF_BRANCH="release/v3.3"
 fi
 
+if [ -z $AR_PR_TARGET_BRANCH ]; then
+	AR_PR_TARGET_BRANCH="release/v1.0"
+fi
+
 # Owner of the target ESP32 Arduino repository
 AR_USER="espressif"
 
@@ -96,13 +100,14 @@ function git_pr_exists(){ # git_pr_exists <branch-name>
 function git_create_pr(){ # git_create_pr <branch> <title>
 	local pr_branch="$1"
 	local pr_title="$2"
+	local pr_target="$3"
 	local pr_body=""
 	for component in `ls "$AR_COMPS"`; do
 		if [ ! $component == "arduino" ] && [ -d "$AR_COMPS/$component/.git" ]; then
 			pr_body+="$component: "$(git -C "$AR_COMPS/$component" symbolic-ref --short HEAD)" "$(git -C "$AR_COMPS/$component" rev-parse --short HEAD)"\r\n"
 		fi
 	done
-	local pr_data="{\"title\": \"$pr_title\", \"body\": \"$pr_body\", \"head\": \"$AR_USER:$pr_branch\", \"base\": \"master\"}"
+	local pr_data="{\"title\": \"$pr_title\", \"body\": \"$pr_body\", \"head\": \"$AR_USER:$pr_branch\", \"base\": \"$pr_target\"}"
 	git_create_pr_res=`echo "$pr_data" | curl -k -H "Authorization: token $GITHUB_TOKEN" -H "Accept: application/vnd.github.v3.raw+json" --data @- "https://api.github.com/repos/$AR_REPO/pulls"`
 	local done_pr=`echo "$git_create_pr_res" | jq -r '.title'`
 	if [ ! "$done_pr" == "" ] && [ ! "$done_pr" == "null" ]; then echo 1; else echo 0; fi