diff --git a/.github/kokoro/continuous-db-artix7.cfg b/.github/kokoro/continuous-db-artix7.cfg
index 6870b866..0b76ee04 100644
--- a/.github/kokoro/continuous-db-artix7.cfg
+++ b/.github/kokoro/continuous-db-artix7.cfg
@@ -9,6 +9,7 @@ action {
     # File types
     regex: "**/diff.html"
     regex: "**/diff.json"
+    regex: "**/diff.patch"
     regex: "**/*result*.xml"
     regex: "**/*sponge_log.xml"
     # Whole directories
diff --git a/.github/kokoro/continuous-db-kintex7.cfg b/.github/kokoro/continuous-db-kintex7.cfg
index cad4fc27..3a29ea8b 100644
--- a/.github/kokoro/continuous-db-kintex7.cfg
+++ b/.github/kokoro/continuous-db-kintex7.cfg
@@ -9,6 +9,7 @@ action {
     # File types
     regex: "**/diff.html"
     regex: "**/diff.json"
+    regex: "**/diff.patch"
     regex: "**/*result*.xml"
     regex: "**/*sponge_log.xml"
     # Whole directories
diff --git a/.github/kokoro/continuous-db-zynq7.cfg b/.github/kokoro/continuous-db-zynq7.cfg
index ba23dabd..92d33b06 100644
--- a/.github/kokoro/continuous-db-zynq7.cfg
+++ b/.github/kokoro/continuous-db-zynq7.cfg
@@ -9,6 +9,7 @@ action {
     # File types
     regex: "**/diff.html"
     regex: "**/diff.json"
+    regex: "**/diff.patch"
     regex: "**/*result*.xml"
     regex: "**/*sponge_log.xml"
     # Whole directories
diff --git a/.github/kokoro/db-full.sh b/.github/kokoro/db-full.sh
index ffad3745..99eba2bd 100755
--- a/.github/kokoro/db-full.sh
+++ b/.github/kokoro/db-full.sh
@@ -107,14 +107,14 @@ echo "----------------------------------------"
 	echo "----------------------------------------"
 	echo " Database Diff Summary"
 	echo "----------------------------------------"
-	git diff --stat --irreversible-delete --find-renames --find-copies --ignore-all-space
+	git diff --stat --irreversible-delete --find-renames --find-copies --ignore-all-space origin/master
 
 	# Output the actually diff
 	echo
 	echo "----------------------------------------"
 	echo " Database Diff"
 	echo "----------------------------------------"
-	git diff --color --irreversible-delete --find-renames --find-copies --ignore-all-space
+	git diff --color --irreversible-delete --find-renames --find-copies --ignore-all-space origin/master
 
 	# Save the diff to be uploaded as an artifact
 	echo
@@ -123,20 +123,18 @@ echo "----------------------------------------"
 	echo "----------------------------------------"
 	# Patch file
 	git diff \
-		--color --irreversible-delete --find-renames --find-copies --ignore-all-space \
+		--color --irreversible-delete --find-renames --find-copies --ignore-all-space origin/master \
 		> diff.patch
 
 	# Pretty HTML file version
 	diff2html --summary=open --file diff.html --format html \
 		-- \
-		--irreversible-delete --find-renames --find-copies --ignore-all-space \
-		|| true
+		--irreversible-delete --find-renames --find-copies --ignore-all-space origin/master
 
 	# Programmatic JSON version
 	diff2html --file diff.json --format json \
 		-- \
-		--irreversible-delete --find-renames --find-copies --ignore-all-space \
-		|| true
+		--irreversible-delete --find-renames --find-copies --ignore-all-space origin/master
 )
 echo "----------------------------------------"
 
diff --git a/.github/kokoro/kokoro-cfg.py b/.github/kokoro/kokoro-cfg.py
index aa8a1a7e..994069b7 100755
--- a/.github/kokoro/kokoro-cfg.py
+++ b/.github/kokoro/kokoro-cfg.py
@@ -12,6 +12,7 @@ action {
     # File types
     regex: "**/diff.html"
     regex: "**/diff.json"
+    regex: "**/diff.patch"
     regex: "**/*result*.xml"
     regex: "**/*sponge_log.xml"
     # Whole directories
diff --git a/.github/kokoro/presubmit-db-artix7.cfg b/.github/kokoro/presubmit-db-artix7.cfg
index acbb99ef..58670fa2 100644
--- a/.github/kokoro/presubmit-db-artix7.cfg
+++ b/.github/kokoro/presubmit-db-artix7.cfg
@@ -9,6 +9,7 @@ action {
     # File types
     regex: "**/diff.html"
     regex: "**/diff.json"
+    regex: "**/diff.patch"
     regex: "**/*result*.xml"
     regex: "**/*sponge_log.xml"
     # Whole directories
diff --git a/.github/kokoro/presubmit-db-kintex7.cfg b/.github/kokoro/presubmit-db-kintex7.cfg
index 21b6b471..504199da 100644
--- a/.github/kokoro/presubmit-db-kintex7.cfg
+++ b/.github/kokoro/presubmit-db-kintex7.cfg
@@ -9,6 +9,7 @@ action {
     # File types
     regex: "**/diff.html"
     regex: "**/diff.json"
+    regex: "**/diff.patch"
     regex: "**/*result*.xml"
     regex: "**/*sponge_log.xml"
     # Whole directories
diff --git a/.github/kokoro/presubmit-db-zynq7.cfg b/.github/kokoro/presubmit-db-zynq7.cfg
index 1413a966..12421619 100644
--- a/.github/kokoro/presubmit-db-zynq7.cfg
+++ b/.github/kokoro/presubmit-db-zynq7.cfg
@@ -9,6 +9,7 @@ action {
     # File types
     regex: "**/diff.html"
     regex: "**/diff.json"
+    regex: "**/diff.patch"
     regex: "**/*result*.xml"
     regex: "**/*sponge_log.xml"
     # Whole directories