diff --git a/.github/labeler.yml b/.github/labeler.yml
index b9f0f36e147d4..01d5aadf2c0f8 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -20,6 +20,14 @@
         - scripts/**/*
         - win32/build/**/*
 
+"Category: CI":
+  - changed-files:
+      - any-glob-to-any-file:
+        - .circleci/**
+        - .github/**
+        - '!.github/lsan-suppressions.txt'
+        - '!.github/ISSUE_TEMPLATE/**'
+
 "Extension: bcmath":
   - changed-files:
       - any-glob-to-any-file:
diff --git a/build/Makefile.gcov b/build/Makefile.gcov
index 0ae5a44944d08..13985a93a101e 100644
--- a/build/Makefile.gcov
+++ b/build/Makefile.gcov
@@ -56,14 +56,14 @@ gcovr-html:
 	@echo "Generating gcovr HTML"
 	@rm -rf gcovr_html/
 	@mkdir gcovr_html
-	gcovr -sr . -o gcovr_html/index.html --html --html-details \
+	gcovr -sr . -o gcovr_html/index.html --html --html-details --exclude-unreachable-branches --exclude-throw-branches \
 		$(foreach pattern, $(GCOVR_EXCLUDE_LINES_BY_PATTERNS), --exclude-lines-by-pattern $(pattern)) \
 		$(foreach lib, $(GCOVR_EXCLUDES), -e $(lib))
 
 gcovr-xml:
 	@echo "Generating gcovr XML"
 	@rm -f gcovr.xml
-	gcovr -sr . -o gcovr.xml --xml \
+	gcovr -sr . -o gcovr.xml --xml --exclude-unreachable-branches --exclude-throw-branches \
 		$(foreach pattern, $(GCOVR_EXCLUDE_LINES_BY_PATTERNS), --exclude-lines-by-pattern $(pattern)) \
 		$(foreach lib, $(GCOVR_EXCLUDES), -e $(lib))