Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
===================================================================
diff -u -r47043f84205046a23497bf8c57060e2dcadf0c9a -r12b3f156acdf3e701ee2b1ff9514889c7c08dd8e
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	(.../ExportToolContentService.java)	(revision 47043f84205046a23497bf8c57060e2dcadf0c9a)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	(.../ExportToolContentService.java)	(revision 12b3f156acdf3e701ee2b1ff9514889c7c08dd8e)
@@ -84,6 +84,7 @@
 import org.lamsfoundation.lams.learningdesign.GroupingActivity;
 import org.lamsfoundation.lams.learningdesign.LearnerChoiceGrouping;
 import org.lamsfoundation.lams.learningdesign.LearningDesign;
+import org.lamsfoundation.lams.learningdesign.LearningDesignAnnotation;
 import org.lamsfoundation.lams.learningdesign.License;
 import org.lamsfoundation.lams.learningdesign.OptionsActivity;
 import org.lamsfoundation.lams.learningdesign.OptionsWithSequencesActivity;
@@ -159,7 +160,7 @@
 public class ExportToolContentService implements IExportToolContentService, ApplicationContextAware {
     private Logger log = Logger.getLogger(ExportToolContentService.class);
 
-     // export tool content zip file prefix
+    // export tool content zip file prefix
     public static final String EXPORT_TOOLCONTNET_ZIP_PREFIX = "lams_toolcontent_";
 
     public static final String EXPORT_LDCONTENT_ZIP_PREFIX = "lams_ldcontent_";
@@ -206,7 +207,6 @@
     private ILearningDesignService learningDesignService;
 
     private ApplicationContext applicationContext;
-        
 
     // save list of all tool file node class information. One tool may have
     // over one file node, such as
@@ -1165,7 +1165,7 @@
 		idx++;
 	    }
 	}
-	Set<Activity> actList = new TreeSet<Activity>(new ActivityOrderComparator());
+	Set<Activity> actList = new TreeSet<>(new ActivityOrderComparator());
 	Map<Long, Activity> activityMapper = new HashMap<>();
 	Map<Integer, Activity> activityByUIIDMapper = new HashMap<>();
 
@@ -1211,7 +1211,7 @@
 		    if (parent.isComplexActivity()) {
 			Set<Activity> set = ((ComplexActivity) parent).getActivities();
 			if (set == null) {
-			    set = new TreeSet<Activity>(new ActivityOrderComparator());
+			    set = new TreeSet<>(new ActivityOrderComparator());
 			    ((ComplexActivity) parent).setActivities(set);
 			}
 			if (!removedActMap.containsKey(actDto.getActivityID())) {
@@ -1407,9 +1407,11 @@
 	String addSuffix = Configuration.get(ConfigurationKeys.SUFFIX_IMPORTED_LD);
 	if ((addSuffix == null) || Boolean.valueOf(addSuffix)) {
 	    String title = ld.getTitle();
-	    if (title == null || title.trim().length() == 0)
+	    if (title == null || title.trim().length() == 0) {
 		title = "unknown";
-	    ld.setTitle(learningDesignService.getUniqueNameForLearningDesign(ld.getTitle(), folder.getWorkspaceFolderId()));
+	    }
+	    ld.setTitle(
+		    learningDesignService.getUniqueNameForLearningDesign(ld.getTitle(), folder.getWorkspaceFolderId()));
 	    learningDesignDAO.update(ld);
 	    // persist
 	}
@@ -1440,6 +1442,13 @@
 	}
 	baseDAO.insertOrUpdateAll(allCompetenceMappings);
 
+	// Process annotations (regions and labels)
+	for (LearningDesignAnnotation annotation : dto.getAnnotations()) {
+	    annotation.setUid(null);
+	    annotation.setLearningDesignId(ld.getLearningDesignId());
+	    baseDAO.insert(annotation);
+	}
+
 	return ld.getLearningDesignId();
     }
 
@@ -2017,18 +2026,18 @@
     }
 
     public MessageService getMessageService() {
-        return messageService;
+	return messageService;
     }
 
     public void setMessageService(MessageService messageService) {
-        this.messageService = messageService;
+	this.messageService = messageService;
     }
 
     public ILearningDesignService getLearningDesignService() {
-        return learningDesignService;
+	return learningDesignService;
     }
 
     public void setLearningDesignService(ILearningDesignService learningDesignService) {
-        this.learningDesignService = learningDesignService;
+	this.learningDesignService = learningDesignService;
     }
 }
\ No newline at end of file