diff --git a/AllInOneRunner/pom.xml b/AllInOneRunner/pom.xml
index 9c8ff9292..a7fc345f4 100644
--- a/AllInOneRunner/pom.xml
+++ b/AllInOneRunner/pom.xml
@@ -9,11 +9,11 @@
 	<artifactId>all-in-one-runner</artifactId>
 	<name>AllInOneRunner</name>
 	<dependencies>
-		<!-- <dependency>
+		<dependency>
 			<groupId>eu.neclab.ngsildbroker</groupId>
 			<artifactId>at-context-server</artifactId>
 			<version>${project.parent.version}</version>
-		</dependency> -->
+		</dependency>
 		<dependency>
 			<groupId>eu.neclab.ngsildbroker</groupId>
 			<artifactId>entity-manager</artifactId>
diff --git a/EntityManager/src/main/java/eu/neclab/ngsildbroker/entityhandler/controller/EntityBatchController.java b/EntityManager/src/main/java/eu/neclab/ngsildbroker/entityhandler/controller/EntityBatchController.java
index f3bac4bb0..eda681c39 100644
--- a/EntityManager/src/main/java/eu/neclab/ngsildbroker/entityhandler/controller/EntityBatchController.java
+++ b/EntityManager/src/main/java/eu/neclab/ngsildbroker/entityhandler/controller/EntityBatchController.java
@@ -273,6 +273,7 @@ public Uni<RestResponse<Object>> deleteMultiple(HttpServerRequest request, Strin
 	}
 	@POST
 	@Path("/merge")
+	@RolesAllowed({"Factory-Admin", "Factory-Editor", "Factory-Writer"})
 	public Uni<RestResponse<Object>> mergeMultiple(HttpServerRequest request,
 													List<Map<String, Object>> compactedEntities, @QueryParam(value = "options") String options,
 													@QueryParam("localOnly") boolean localOnly) {
diff --git a/pom.xml b/pom.xml
index 0e4dafeb5..0b1cb4832 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
   <modules>
     <module>BrokerParent</module>
     <module>Commons</module>
-    <!-- <module>at-context-server</module> -->
+    <module>at-context-server</module>
     <module>EntityManager</module>
     <module>QueryManager</module>
     <module>SubscriptionManager</module>