diff --git a/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/service/impl/ValidDocumentServiceImpl.java b/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/service/impl/ValidDocumentServiceImpl.java
index a6539cc1250..9603ba0d7ff 100644
--- a/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/service/impl/ValidDocumentServiceImpl.java
+++ b/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/service/impl/ValidDocumentServiceImpl.java
@@ -12,6 +12,7 @@
 import jakarta.transaction.Transactional;
 
 import io.mosip.kernel.masterdata.dto.response.FilterResult;
+import io.mosip.kernel.masterdata.utils.*;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
@@ -61,12 +62,6 @@
 import io.mosip.kernel.masterdata.repository.DocumentTypeRepository;
 import io.mosip.kernel.masterdata.repository.ValidDocumentRepository;
 import io.mosip.kernel.masterdata.service.ValidDocumentService;
-import io.mosip.kernel.masterdata.utils.MapperUtils;
-import io.mosip.kernel.masterdata.utils.MasterDataFilterHelper;
-import io.mosip.kernel.masterdata.utils.MasterdataSearchHelper;
-import io.mosip.kernel.masterdata.utils.MetaDataUtils;
-import io.mosip.kernel.masterdata.utils.OptionalFilter;
-import io.mosip.kernel.masterdata.utils.PageUtils;
 import io.mosip.kernel.masterdata.validator.FilterColumnValidator;
 import io.mosip.kernel.masterdata.validator.FilterTypeEnum;
 import io.mosip.kernel.masterdata.validator.FilterTypeValidator;
@@ -113,6 +108,9 @@ public class ValidDocumentServiceImpl implements ValidDocumentService {
 
 	@Autowired
 	private FilterTypeValidator filterTypeValidator;
+
+	@Autowired
+	private LanguageUtils languageUtils;
 	
   /*
 	 * (non-Javadoc)
@@ -127,6 +125,7 @@ public ValidDocumentID createValidDocument(ValidDocumentDto document) {
 
 		ValidDocument validDocument = MetaDataUtils.setCreateMetaData(document, ValidDocument.class);
 		validDocument.setIsActive(true);
+		validDocument.setLangCode(languageUtils.getDefaultLanguage()); //setting lang-code, as its required to be non-null for pre-reg (<=1.2.0.1)
 		try {
 			validDocument = documentRepository.create(validDocument);
 		} catch (DataAccessLayerException | DataAccessException e) {
diff --git a/admin/kernel-syncdata-service/src/main/java/io/mosip/kernel/syncdata/SyncDataBootApplication.java b/admin/kernel-syncdata-service/src/main/java/io/mosip/kernel/syncdata/SyncDataBootApplication.java
index 1b20cafd9e7..f9c62f0f8e5 100644
--- a/admin/kernel-syncdata-service/src/main/java/io/mosip/kernel/syncdata/SyncDataBootApplication.java
+++ b/admin/kernel-syncdata-service/src/main/java/io/mosip/kernel/syncdata/SyncDataBootApplication.java
@@ -23,7 +23,7 @@
 @ComponentScan( value = {"io.mosip.kernel.syncdata.*", "${mosip.auth.adapter.impl.basepackage}",
 		"io.mosip.kernel.core", "io.mosip.kernel.crypto", "io.mosip.kernel.clientcrypto.service.impl",
 		"io.mosip.kernel.keymanagerservice.service", "io.mosip.kernel.keymanagerservice.util",
-		"io.mosip.kernel.keymanagerservice.helper", "io.mosip.kernel.keymanager",
+		"io.mosip.kernel.keymanagerservice.helper", "io.mosip.kernel.keymanager.hsm.impl",
 		"io.mosip.kernel.cryptomanager.util", "io.mosip.kernel.partnercertservice.helper",
 		"io.mosip.kernel.partnercertservice.service", "io.mosip.kernel.websub.api.client",
 		"io.mosip.kernel.keygenerator.bouncycastle", "io.mosip.kernel.websub.api.config",
diff --git a/admin/kernel-syncdata-service/src/main/java/io/mosip/kernel/syncdata/repository/TemplateTypeRepository.java b/admin/kernel-syncdata-service/src/main/java/io/mosip/kernel/syncdata/repository/TemplateTypeRepository.java
index fb34da20164..23152a57f45 100644
--- a/admin/kernel-syncdata-service/src/main/java/io/mosip/kernel/syncdata/repository/TemplateTypeRepository.java
+++ b/admin/kernel-syncdata-service/src/main/java/io/mosip/kernel/syncdata/repository/TemplateTypeRepository.java
@@ -24,6 +24,10 @@ public interface TemplateTypeRepository extends JpaRepository<TemplateType, Stri
 	@Cacheable(cacheNames = "initial-sync", key = "'template_type'", condition = "#a0.getYear() <= 1970")
 	@Query("FROM TemplateType WHERE (createdDateTime BETWEEN ?1 AND ?2) OR (updatedDateTime BETWEEN ?1 AND ?2)  OR (deletedDateTime BETWEEN ?1 AND ?2)")
 	List<TemplateType> findAllLatestCreatedUpdateDeleted(LocalDateTime lastUpdated, LocalDateTime currentTimeStamp);
+	
+	@Cacheable(cacheNames = "initial-sync", key = "'template_type'", condition = "#a0.getYear() <= 1970")
+	@Query(value = "select * from master.template_type WHERE (code IN (select distinct template_typ_code from master.template where module_id=?3)) AND ((cr_dtimes between ?1 AND ?2) OR (upd_dtimes between ?1 AND ?2)  OR (del_dtimes between ?1 AND ?2))", nativeQuery = true)
+	List<TemplateType> findAllLatestCreatedUpdateDeletedTemplateTypeCode(LocalDateTime lastUpdated, LocalDateTime currentTimeStamp, String regclientModuleId);
 
 	@Cacheable(cacheNames = "delta-sync", key = "'template_type'")
 	@Query(value = "select new io.mosip.kernel.syncdata.dto.EntityDtimes(max(aam.createdDateTime), max(aam.updatedDateTime), max(aam.deletedDateTime)) from TemplateType aam ")
diff --git a/admin/kernel-syncdata-service/src/test/java/io/mosip/kernel/syncdata/test/TestBootApplication.java b/admin/kernel-syncdata-service/src/test/java/io/mosip/kernel/syncdata/test/TestBootApplication.java
index 6e1df958c19..9f59a0d3989 100644
--- a/admin/kernel-syncdata-service/src/test/java/io/mosip/kernel/syncdata/test/TestBootApplication.java
+++ b/admin/kernel-syncdata-service/src/test/java/io/mosip/kernel/syncdata/test/TestBootApplication.java
@@ -18,7 +18,7 @@
 		"io.mosip.kernel.core", "io.mosip.kernel.crypto",
 		"io.mosip.kernel.signature.service","io.mosip.kernel.clientcrypto.service.impl",
 		"io.mosip.kernel.keymanagerservice.service", "io.mosip.kernel.keymanagerservice.util",
-		"io.mosip.kernel.keymanagerservice.helper", "io.mosip.kernel.keymanager",
+		"io.mosip.kernel.keymanagerservice.helper", "io.mosip.kernel.keymanager.hsm.impl",
 		"io.mosip.kernel.cryptomanager.util", "io.mosip.kernel.partnercertservice.helper",
 		"io.mosip.kernel.partnercertservice.service", "io.mosip.kernel.websub.api.client",
 		"io.mosip.kernel.keygenerator.bouncycastle"})
diff --git a/db_scripts/mosip_master/ddl/master-valid_document.sql b/db_scripts/mosip_master/ddl/master-valid_document.sql
index b0d63fdbe50..4a5e5819bb1 100644
--- a/db_scripts/mosip_master/ddl/master-valid_document.sql
+++ b/db_scripts/mosip_master/ddl/master-valid_document.sql
@@ -5,7 +5,7 @@
 CREATE TABLE master.valid_document(
 	doctyp_code character varying(36) NOT NULL,
 	doccat_code character varying(36) NOT NULL,
-	lang_code character varying(3),
+	lang_code character varying(3) NOT NULL,
 	is_active boolean NOT NULL,
 	cr_by character varying(256) NOT NULL,
 	cr_dtimes timestamp NOT NULL,