diff --git a/api/v1/submissions/index.php b/api/v1/submissions/index.php
index c56f68d723..8abef49b24 100644
--- a/api/v1/submissions/index.php
+++ b/api/v1/submissions/index.php
@@ -25,6 +25,8 @@
     return new \PKP\handler\APIHandler(new \PKP\API\v1\submissions\PKPSubmissionFileController());
 } elseif (strpos($requestPath, '/tasks')) {
     return new \PKP\handler\APIHandler(new \PKP\API\v1\submissions\tasks\EditorialTaskController());
+} 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 8b2970037c..c3cc713826 100644
--- a/dbscripts/xml/upgrade.xml
+++ b/dbscripts/xml/upgrade.xml
@@ -194,6 +194,7 @@
 		<migration class="PKP\migration\upgrade\v3_6_0\I12204_ReviewAssignmentPublicVisibility"/>
 		<migration class="PKP\migration\upgrade\v3_6_0\I12048_ReviewRoundAuthorResponse"/>
         <migration class="PKP\migration\upgrade\v3_6_0\I11332_AddPeerReviewDois" />
+        <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 7663a7cdf6..6050e5139c 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit 7663a7cdf6041392f71290dd76a430a74bc3fd28
+Subproject commit 6050e5139cc14970e6d740101ac8739ff3d146e9
diff --git a/lib/ui-library b/lib/ui-library
index 1e9b089664..4c6fbaece2 160000
--- a/lib/ui-library
+++ b/lib/ui-library
@@ -1 +1 @@
-Subproject commit 1e9b089664eb22bd4572cef20705488ed598a782
+Subproject commit 4c6fbaece2d540bf46e4e56fad9c827f5e0a23bc