diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_8_0/6224-resolve-tag-definition-in-same-thread.yaml b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_8_0/6224-resolve-tag-definition-in-same-thread.yaml
new file mode 100644
index 00000000000..169b3a8b1c1
--- /dev/null
+++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_8_0/6224-resolve-tag-definition-in-same-thread.yaml
@@ -0,0 +1,7 @@
+---
+type: perf
+issue: 6224
+title: "The JPA server will no longer use a separate thread and database connection
+  to resolve tag definitions. This should improve performance in some cases, and
+  resolves compatibility issues for some environments. Thanks to Ibrahim (Trifork A/S)
+  for the pull request!"
diff --git a/pom.xml b/pom.xml
index e734cf2a653..e4702185057 100644
--- a/pom.xml
+++ b/pom.xml
@@ -952,6 +952,11 @@
 			<id>SevcikMichal</id>
 			<name>Michal Sevcik</name>
 		</developer>
+		<developer>
+			<id>iyt-trifork</id>
+			<name>Ibrahim</name>
+			<organization>Trifork A/S</organization>
+		</developer>
 	</developers>
 
 	<licenses>