diff --git a/api/v1/submissions/index.php b/api/v1/submissions/index.php
index 9d86d7248ef..7d831861407 100644
--- a/api/v1/submissions/index.php
+++ b/api/v1/submissions/index.php
@@ -29,6 +29,8 @@
     return new \PKP\handler\APIHandler(new \PKP\API\v1\submissions\tasks\EditorialTaskController());
 } elseif (strpos($requestPath, '/dataCitations')) {
     return new \PKP\handler\APIHandler(new \PKP\API\v1\dataCitations\PKPDataCitationController());
+} elseif (strpos($requestPath, '/mediaFiles')) {
+    return new \PKP\handler\APIHandler(new \PKP\API\v1\submissions\MediaFilesController());
 } else {
     return new \PKP\handler\APIHandler(new \APP\API\v1\submissions\SubmissionController());
 }
diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
index fe7179fc5be..3c67e519269 100644
--- a/dbscripts/xml/upgrade.xml
+++ b/dbscripts/xml/upgrade.xml
@@ -207,6 +207,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 aee04153f01..5b0004c2fc5 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit aee04153f01b75b648269f995dc65572b0e5ee3c
+Subproject commit 5b0004c2fc5dc660b02e1ee29bade011f2135163