Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r5ce80833bb0828de219fc5b59e9e73c365da8559 -rd9653595fbb52e47a56519a3eb6bc5f58cf307fe
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 5ce80833bb0828de219fc5b59e9e73c365da8559)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision d9653595fbb52e47a56519a3eb6bc5f58cf307fe)
@@ -663,4 +663,5 @@
 config.header.etherpad =Etherpad
 config.etherpad.server.url =Server URL
 config.etherpad.api.key =API key
+config.etherpad.instance.id =Instance ID
 #======= End labels: Exported 652 labels for en AU =====
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200326.sql
===================================================================
diff -u -r5ce80833bb0828de219fc5b59e9e73c365da8559 -rd9653595fbb52e47a56519a3eb6bc5f58cf307fe
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200326.sql	(.../patch20200326.sql)	(revision 5ce80833bb0828de219fc5b59e9e73c365da8559)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200326.sql	(.../patch20200326.sql)	(revision d9653595fbb52e47a56519a3eb6bc5f58cf307fe)
@@ -4,10 +4,10 @@
 --  LDEV-4997 Etherpad as service
 
 INSERT INTO lams_configuration (config_key, config_value, description_key, header_name, format, required)
-VALUES ('EtherpadServerUrl', 'http://localhost:9001', 'config.etherpad.server.url', 'config.header.etherpad', 'STRING', 0),
-	   ('EtherpadApiKey',    '', 					  'config.etherpad.api.key',    'config.header.etherpad', 'STRING', 0);
+VALUES ('EtherpadServerUrl', 'http://localhost:9001', 'config.etherpad.server.url',  'config.header.etherpad', 'STRING', 0),
+	   ('EtherpadApiKey',    '', 					  'config.etherpad.api.key',     'config.header.etherpad', 'STRING', 0),
+	   ('EtherpadInstanceID','LAMS', 				  'config.etherpad.instance.id','config.header.etherpad', 'STRING', 0);
 
-
 COMMIT;
 SET AUTOCOMMIT = 1;
 set FOREIGN_KEY_CHECKS = 1;
Index: lams_common/src/java/org/lamsfoundation/lams/etherpad/service/EtherpadService.java
===================================================================
diff -u -rdc7b0c799bd3c4a346c4e66dfffa159d94b321a7 -rd9653595fbb52e47a56519a3eb6bc5f58cf307fe
--- lams_common/src/java/org/lamsfoundation/lams/etherpad/service/EtherpadService.java	(.../EtherpadService.java)	(revision dc7b0c799bd3c4a346c4e66dfffa159d94b321a7)
+++ lams_common/src/java/org/lamsfoundation/lams/etherpad/service/EtherpadService.java	(.../EtherpadService.java)	(revision d9653595fbb52e47a56519a3eb6bc5f58cf307fe)
@@ -30,7 +30,12 @@
 	Map<String, Object> result = new HashMap<>();
 	result.put("client", client);
 
-	// create Etherpad Group assossiated with this session
+	// add Etherpad instance ID so we can group LAMS instances to share Etherpads
+	String instanceID = Configuration.get(ConfigurationKeys.ETHERPAD_INSTANCE_ID);
+	if (StringUtils.isNotBlank(instanceID)) {
+	    groupIdentifier = instanceID + "-" + groupIdentifier;
+	}
+	// create Etherpad Group associated with this session
 	Map<String, Object> map = client.createGroupIfNotExistsFor(groupIdentifier);
 	String groupId = (String) map.get("groupID");
 	result.put("groupId", groupId);
Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
===================================================================
diff -u -r5ce80833bb0828de219fc5b59e9e73c365da8559 -rd9653595fbb52e47a56519a3eb6bc5f58cf307fe
--- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	(.../ConfigurationKeys.java)	(revision 5ce80833bb0828de219fc5b59e9e73c365da8559)
+++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	(.../ConfigurationKeys.java)	(revision d9653595fbb52e47a56519a3eb6bc5f58cf307fe)
@@ -293,4 +293,5 @@
     // LDEV-4997 Etherpad as service
     public static String ETHERPAD_SERVER_URL = "EtherpadServerUrl";
     public static String ETHERPAD_API_KEY = "EtherpadApiKey";
+    public static String ETHERPAD_INSTANCE_ID = "EtherpadInstanceID";
 }