diff --git a/api/v1/genres/index.php b/api/v1/genres/index.php
new file mode 100644
index 00000000000..86e500ea7e1
--- /dev/null
+++ b/api/v1/genres/index.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * @defgroup api_v1_genres Genre API requests
+ */
+
+/**
+ * @file api/v1/genres/index.php
+ *
+ * Copyright (c) 2026 Simon Fraser University
+ * Copyright (c) 2026 John Willinsky
+ * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
+ *
+ * @ingroup api_v1_genres
+ *
+ * @brief Handle requests for genre API functions.
+ *
+ */
+
+return new \PKP\handler\APIHandler(new \PKP\API\v1\genres\GenreController());
diff --git a/api/v1/submissions/index.php b/api/v1/submissions/index.php
index 9f39f71e24d..75db0064ae9 100644
--- a/api/v1/submissions/index.php
+++ b/api/v1/submissions/index.php
@@ -43,4 +43,8 @@
     return new \PKP\handler\APIHandler(new \PKP\API\v1\submissions\tasks\EditorialTaskController());
 }
 
+if (in_array('mediaFiles', $urlParts)) {
+    return new \PKP\handler\APIHandler(new \PKP\API\v1\submissions\MediaFilesController());
+}
+
 return new \PKP\handler\APIHandler(new \APP\API\v1\submissions\SubmissionController());
diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
index 1c25b5aeef9..067989a36fc 100644
--- a/dbscripts/xml/upgrade.xml
+++ b/dbscripts/xml/upgrade.xml
@@ -223,6 +223,7 @@
         <migration class="PKP\migration\upgrade\v3_6_0\I11332_AddPeerReviewDois" />
 		<migration class="PKP\migration\upgrade\v3_6_0\I6278_DataCitations" />
         <migration class="PKP\migration\upgrade\v3_6_0\I12307_ReviewRoundRequestAuthorResponseMail" />
+        <migration class="PKP\migration\upgrade\v3_6_0\I12251_SupportMediaFiles" />
 		<code function="rebuildSearchIndex" />
 		<note file="docs/release-notes/README-3.6.0" />
 	</upgrade>
diff --git a/lib/pkp b/lib/pkp
index 3c10b932bf3..44e07d9f65a 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit 3c10b932bf3718a622da61a245a4128a81528cdd
+Subproject commit 44e07d9f65afdab7b779c9228df29e58c49c8519
diff --git a/registry/genres.xml b/registry/genres.xml
index 5e66fab761a..1987671e487 100644
--- a/registry/genres.xml
+++ b/registry/genres.xml
@@ -25,7 +25,7 @@
 	<genre key="DATASET" category="3" dependent="0" supplementary="1" localeKey="default.genres.dataSet" />
 	<genre key="SOURCETEXTS" category="3" dependent="0" supplementary="1" localeKey="default.genres.sourceTexts" />
 	<genre key="MULTIMEDIA" category="1" dependent="1" supplementary="1" localeKey="default.genres.multimedia" />
-	<genre key="IMAGE" category="2" dependent="1" supplementary="0" localeKey="default.genres.image" />
+	<genre key="IMAGE" category="2" dependent="1" supplementary="0" supportsFileVariants="1" localeKey="default.genres.image" />
 	<genre key="STYLE" category="1" dependent="1" supplementary="0" localeKey="default.genres.styleSheet" />
 	<genre key="OTHER" category="3" dependent="0" supplementary="1" localeKey="default.genres.other" />
 </genres>