diff --git a/api/v1/comments/index.php b/api/v1/comments/index.php
new file mode 100644
index 0000000000..f0b38587fd
--- /dev/null
+++ b/api/v1/comments/index.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * @defgroup api_v1_comments Comment API requests
+ */
+
+/**
+ * @file api/v1/comments/index.php
+ *
+ * Copyright (c) 2023 Simon Fraser University
+ * Copyright (c) 2023 John Willinsky
+ * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
+ *
+ * @ingroup api_v1_comments
+ *
+ * @brief Handle requests for comment API functions.
+ *
+ */
+
+return new \PKP\handler\APIHandler(new \PKP\API\v1\comments\UserCommentController());
diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
index f0a0ea71c8..d793ea1f70 100644
--- a/dbscripts/xml/upgrade.xml
+++ b/dbscripts/xml/upgrade.xml
@@ -159,11 +159,12 @@
 	</upgrade>
 
 	<upgrade minversion="3.5.0.0" maxversion="3.5.9.9">
-		<migration class="PKP\migration\upgrade\v3_6_0\PreflightCheckMigration" fallback="3.5.9.9" />
+		<migration class="PKP\migration\upgrade\v3_6_0\PreflightCheckMigration" fallback="3.5.9.9"/>
 		<migration class="PKP\migration\upgrade\v3_6_0\I10403_EmailTemplateUserGroupAccess"/>
-		<migration class="APP\migration\install\ReviewerRecommendationsMigration" />
+		<migration class="APP\migration\install\ReviewerRecommendationsMigration"/>
 		<migration class="APP\migration\upgrade\v3_6_0\I1660_ReviewerRecommendations"/>
 		<migration class="APP\migration\upgrade\v3_6_0\I10404_UpdateCategoryImageNameFields"/>
+		<migration class="PKP\migration\upgrade\v3_6_0\I11326_UserComments"/>
 	</upgrade>
 
 	<upgrade minversion="3.1.0.0" maxversion="3.5.9.9">
diff --git a/lib/pkp b/lib/pkp
index e65b230a3c..d08e2a2acd 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit e65b230a3c742ee684e1f6da92aa721d62e31116
+Subproject commit d08e2a2acd9313ba3270c81b17dd5b8f048f9c03