diff --git a/apps/100ms-custom-app/package.json b/apps/100ms-custom-app/package.json
index c68608888f..30c5ba50d7 100644
--- a/apps/100ms-custom-app/package.json
+++ b/apps/100ms-custom-app/package.json
@@ -3,8 +3,8 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@100mslive/react-icons": "0.8.24",
-    "@100mslive/roomkit-react": "0.1.15",
+    "@100mslive/react-icons": "0.8.25",
+    "@100mslive/roomkit-react": "0.1.16",
     "axios": "^0.21.1",
     "js-cookies": "^1.0.4",
     "lodash.merge": "^4.6.2",
diff --git a/apps/100ms-web/package.json b/apps/100ms-web/package.json
index b61a810eb2..5954700fee 100644
--- a/apps/100ms-web/package.json
+++ b/apps/100ms-web/package.json
@@ -9,11 +9,11 @@
     "src"
   ],
   "dependencies": {
-    "@100mslive/hls-player": "0.1.24",
-    "@100mslive/hms-virtual-background": "1.11.24",
-    "@100mslive/react-icons": "0.8.24",
-    "@100mslive/react-sdk": "0.8.24",
-    "@100mslive/roomkit-react": "0.1.15",
+    "@100mslive/hls-player": "0.1.25",
+    "@100mslive/hms-virtual-background": "1.11.25",
+    "@100mslive/react-icons": "0.8.25",
+    "@100mslive/react-sdk": "0.8.25",
+    "@100mslive/roomkit-react": "0.1.16",
     "@emoji-mart/data": "^1.0.6",
     "@emoji-mart/react": "^1.0.1",
     "@tldraw/tldraw": "^1.18.4",
diff --git a/packages/hls-player/package.json b/packages/hls-player/package.json
index c8f6fef456..af819fe989 100644
--- a/packages/hls-player/package.json
+++ b/packages/hls-player/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@100mslive/hls-player",
-  "version": "0.1.24",
+  "version": "0.1.25",
   "description": "HLS client library which uses HTML5 Video element and Media Source Extension for playback",
   "main": "dist/index.cjs.js",
   "module": "dist/index.js",
@@ -31,7 +31,7 @@
   "author": "100ms",
   "license": "MIT",
   "dependencies": {
-    "@100mslive/hls-stats": "0.2.24",
+    "@100mslive/hls-stats": "0.2.25",
     "eventemitter2": "^6.4.7",
     "hls.js": "1.4.12"
   }
diff --git a/packages/hls-stats/package.json b/packages/hls-stats/package.json
index 1bdf1038de..007bc45d1c 100644
--- a/packages/hls-stats/package.json
+++ b/packages/hls-stats/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@100mslive/hls-stats",
-  "version": "0.2.24",
+  "version": "0.2.25",
   "description": "A simple library that provides stats for your hls stream",
   "main": "dist/index.cjs.js",
   "module": "dist/index.js",
diff --git a/packages/hms-noise-suppression/package.json b/packages/hms-noise-suppression/package.json
index d5a74cd366..c88646efe7 100644
--- a/packages/hms-noise-suppression/package.json
+++ b/packages/hms-noise-suppression/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.24",
+  "version": "0.9.25",
   "license": "MIT",
   "main": "dist/index.cjs.js",
   "typings": "dist/index.d.ts",
@@ -37,6 +37,6 @@
   "author": "vishaldhull09",
   "module": "dist/index.js",
   "devDependencies": {
-    "@100mslive/hms-video": "0.9.24"
+    "@100mslive/hms-video": "0.9.25"
   }
 }
diff --git a/packages/hms-video-store/package.json b/packages/hms-video-store/package.json
index cf56b27674..db119bce51 100644
--- a/packages/hms-video-store/package.json
+++ b/packages/hms-video-store/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.10.24",
+  "version": "0.10.25",
   "license": "MIT",
   "main": "dist/index.cjs.js",
   "module": "dist/index.js",
@@ -41,7 +41,7 @@
   "author": "100ms",
   "sideEffects": false,
   "dependencies": {
-    "@100mslive/hms-video": "0.9.24",
+    "@100mslive/hms-video": "0.9.25",
     "eventemitter2": "^6.4.7",
     "immer": "^9.0.6",
     "reselect": "4.0.0",
diff --git a/packages/hms-video-web/package.json b/packages/hms-video-web/package.json
index 07719a65d5..71c3206c7d 100644
--- a/packages/hms-video-web/package.json
+++ b/packages/hms-video-web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@100mslive/hms-video",
-  "version": "0.9.24",
+  "version": "0.9.25",
   "license": "MIT",
   "main": "dist/index.cjs.js",
   "typings": "dist/index.d.ts",
diff --git a/packages/hms-virtual-background/package.json b/packages/hms-virtual-background/package.json
index 4a3cb60e86..f2ab31887a 100755
--- a/packages/hms-virtual-background/package.json
+++ b/packages/hms-virtual-background/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.11.24",
+  "version": "1.11.25",
   "license": "MIT",
   "main": "dist/index.cjs.js",
   "typings": "dist/index.d.ts",
@@ -24,13 +24,13 @@
     "format": "prettier --write src/**/*.ts"
   },
   "peerDependencies": {
-    "@100mslive/hms-video": "0.9.24"
+    "@100mslive/hms-video": "0.9.25"
   },
   "name": "@100mslive/hms-virtual-background",
   "author": "ashish17",
   "module": "dist/index.js",
   "devDependencies": {
-    "@100mslive/hms-video": "0.9.24"
+    "@100mslive/hms-video": "0.9.25"
   },
   "dependencies": {
     "@mediapipe/selfie_segmentation": "^0.1.1632777926",
diff --git a/packages/react-icons/package.json b/packages/react-icons/package.json
index c9bbee59fe..10a4073cb8 100644
--- a/packages/react-icons/package.json
+++ b/packages/react-icons/package.json
@@ -4,7 +4,7 @@
   "main": "dist/index.cjs.js",
   "module": "dist/index.js",
   "typings": "dist/index.d.ts",
-  "version": "0.8.24",
+  "version": "0.8.25",
   "author": "100ms",
   "license": "MIT",
   "files": [
diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.json
index a3e9487fd3..dbab331ce7 100644
--- a/packages/react-sdk/package.json
+++ b/packages/react-sdk/package.json
@@ -4,7 +4,7 @@
   "main": "dist/index.cjs.js",
   "module": "dist/index.js",
   "typings": "dist/index.d.ts",
-  "version": "0.8.24",
+  "version": "0.8.25",
   "author": "100ms",
   "license": "MIT",
   "files": [
@@ -43,7 +43,7 @@
     "react": ">=16.8 <19.0.0"
   },
   "dependencies": {
-    "@100mslive/hms-video-store": "0.10.24",
+    "@100mslive/hms-video-store": "0.10.25",
     "react-resize-detector": "^7.0.0",
     "zustand": "^3.6.2"
   }
diff --git a/packages/roomkit-react/package.json b/packages/roomkit-react/package.json
index b58a378769..54e8b76dca 100644
--- a/packages/roomkit-react/package.json
+++ b/packages/roomkit-react/package.json
@@ -10,7 +10,7 @@
     "prebuilt",
     "roomkit"
   ],
-  "version": "0.1.15",
+  "version": "0.1.16",
   "author": "100ms",
   "license": "MIT",
   "files": [
@@ -76,10 +76,10 @@
     "react": ">=17.0.2 <19.0.0"
   },
   "dependencies": {
-    "@100mslive/hls-player": "0.1.24",
-    "@100mslive/hms-virtual-background": "1.11.24",
-    "@100mslive/react-icons": "0.8.24",
-    "@100mslive/react-sdk": "0.8.24",
+    "@100mslive/hls-player": "0.1.25",
+    "@100mslive/hms-virtual-background": "1.11.25",
+    "@100mslive/react-icons": "0.8.25",
+    "@100mslive/react-sdk": "0.8.25",
     "@100mslive/types-prebuilt": "0.12.5",
     "@emoji-mart/data": "^1.0.6",
     "@emoji-mart/react": "^1.0.1",
diff --git a/packages/roomkit-react/src/Prebuilt/common/constants.ts b/packages/roomkit-react/src/Prebuilt/common/constants.ts
index cb03d15d4f..680e68f939 100644
--- a/packages/roomkit-react/src/Prebuilt/common/constants.ts
+++ b/packages/roomkit-react/src/Prebuilt/common/constants.ts
@@ -121,15 +121,15 @@ export enum INTERACTION_TYPE {
 export enum QUESTION_TYPE_TITLE {
   'single-choice' = 'Single Choice',
   'multiple-choice' = 'Multiple Choice',
-  // "short-answer": "Short Answer",
-  // "long-answer": "Long Answer",
+  'short-answer' = 'Short Answer',
+  'long-answer' = 'Long Answer',
 }
 
 export enum QUESTION_TYPE {
   SINGLE_CHOICE = 'single-choice',
   MULTIPLE_CHOICE = 'multiple-choice',
-  // SHORT_ANSWER: "short-answer",
-  // LONG_ANSWER: "long-answer",
+  SHORT_ANSWER = 'short-answer',
+  LONG_ANSWER = 'long-answer',
 }
 
 export const ROLE_CHANGE_DECLINED = 'role_change_declined';
diff --git a/packages/roomkit-react/src/Prebuilt/components/VideoLayouts/GridLayout.tsx b/packages/roomkit-react/src/Prebuilt/components/VideoLayouts/GridLayout.tsx
index 4211bdc671..8b4b0b770c 100644
--- a/packages/roomkit-react/src/Prebuilt/components/VideoLayouts/GridLayout.tsx
+++ b/packages/roomkit-react/src/Prebuilt/components/VideoLayouts/GridLayout.tsx
@@ -80,6 +80,7 @@ export const GridLayout = ({
 
   useEffect(() => {
     if (mainPage !== 0) {
+      peersSorter.stop();
       return;
     }
     peersSorter.setPeersAndTilesPerPage({
@@ -87,6 +88,9 @@ export const GridLayout = ({
       tilesPerPage: pageSize,
     });
     peersSorter.onUpdate(setSortedPeers);
+    return () => {
+      peersSorter.stop();
+    };
   }, [mainPage, peersSorter, updatedPeers, pageSize]);
 
   if (peerSharing) {
diff --git a/packages/roomkit-web/package.json b/packages/roomkit-web/package.json
index 17b28d5130..818b2dae24 100644
--- a/packages/roomkit-web/package.json
+++ b/packages/roomkit-web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@100mslive/roomkit-web",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "A web component implementation of 100ms Prebuilt component",
   "keywords": [
     "web-components",
@@ -28,7 +28,7 @@
     "build": "rm -rf dist && node ../../scripts/build-webapp"
   },
   "dependencies": {
-    "@100mslive/roomkit-react": "0.1.15",
+    "@100mslive/roomkit-react": "0.1.16",
     "@r2wc/react-to-web-component": "2.0.2"
   }
 }