diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/OAuthRequestInterceptor.java b/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/OAuthRequestInterceptor.java
index d9afb2aa55..a7fe693c97 100755
--- a/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/OAuthRequestInterceptor.java
+++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/OAuthRequestInterceptor.java
@@ -1,3 +1,4 @@
+
 /*
  * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
  *
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/pagination/PaginationConfiguration.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/pagination/PaginationConfiguration.java
index 46e16aff6d..d2b1ea5518 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/pagination/PaginationConfiguration.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/pagination/PaginationConfiguration.java
@@ -32,6 +32,7 @@ public class PaginationConfiguration {
     private int operationListPageSize;
     private int notificationListPageSize;
     private int activityListPageSize;
+    private int topicListPageSize;
 
     public int getDeviceListPageSize() {
         return deviceListPageSize;
@@ -78,4 +79,14 @@ public class PaginationConfiguration {
         this.activityListPageSize = activityListPageSize;
     }
 
+    public int getTopicListPageSize() {
+        return deviceListPageSize;
+    }
+
+    @XmlElement(name = "TopicListPageSize", required = true)
+    public void setTopicListPageSize(int topicListPageSize) {
+        this.topicListPageSize = topicListPageSize;
+    }
+
+
 }
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml
index ec27d993e3..81caae253c 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml
@@ -65,6 +65,7 @@
         <NotificationListPageSize>20</NotificationListPageSize>
         <ActivityListPageSize>20</ActivityListPageSize>
         <OperationListPageSize>20</OperationListPageSize>
+        <TopicListPageSize>20</TopicListPageSize>
     </PaginationConfiguration>
     <!--This specifies whether to enable the DeviceStatus Task in this node. In clustered setup only master node
      should  have to run this task.-->