diff --git a/android/buildSrc/src/main/kotlin/BuildConfigs.kt b/android/buildSrc/src/main/kotlin/BuildConfigs.kt
index b4ac17129a9..7b8368968ea 100644
--- a/android/buildSrc/src/main/kotlin/BuildConfigs.kt
+++ b/android/buildSrc/src/main/kotlin/BuildConfigs.kt
@@ -2,8 +2,8 @@ object BuildConfigs {
     const val minSdk = 26
     const val compileSdk = 34
     const val targetSdk = 34
-    const val versionCode = 11
-    const val versionName = "2.0.1"
+    const val versionCode = 12
+    const val versionName = "2.0.2"
     const val applicationId = "org.smartregister.opensrp"
     const val jvmToolchain = 17
     const val kotlinCompilerExtensionVersion = "1.5.8"
diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/ConfigurationRegistry.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/ConfigurationRegistry.kt
index 3069b43521e..c50c839ce95 100644
--- a/android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/ConfigurationRegistry.kt
+++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/ConfigurationRegistry.kt
@@ -21,6 +21,7 @@ import android.database.SQLException
 import ca.uhn.fhir.context.ConfigurationException
 import ca.uhn.fhir.parser.DataFormatException
 import com.google.android.fhir.FhirEngine
+import com.google.android.fhir.datacapture.extensions.logicalId
 import com.google.android.fhir.db.ResourceNotFoundException
 import com.google.android.fhir.get
 import com.google.android.fhir.knowledge.KnowledgeManager
@@ -47,6 +48,7 @@ import org.hl7.fhir.r4.model.ImplementationGuide
 import org.hl7.fhir.r4.model.ListResource
 import org.hl7.fhir.r4.model.MetadataResource
 import org.hl7.fhir.r4.model.Parameters
+import org.hl7.fhir.r4.model.Reference
 import org.hl7.fhir.r4.model.Resource
 import org.hl7.fhir.r4.model.ResourceType
 import org.hl7.fhir.r4.model.SearchParameter
@@ -336,19 +338,19 @@ constructor(
         }
       }
     } else {
-      composition.retrieveCompositionSections().forEach {
-        if (it.hasFocus() && it.focus.hasReferenceElement() && it.focus.hasIdentifier()) {
-          val configIdentifier = it.focus.identifier.value
-          val referenceResourceType = it.focus.reference.substringBefore(TYPE_REFERENCE_DELIMITER)
-          if (isAppConfig(referenceResourceType) && !isIconConfig(configIdentifier)) {
-            val extractedId = it.focus.extractId()
-            try {
-              val configBinary = fhirEngine.get<Binary>(extractedId)
-              configsJsonMap[configIdentifier] = configBinary.content.decodeToString()
-            } catch (resourceNotFoundException: ResourceNotFoundException) {
-              Timber.e("Missing Binary file with ID :$extractedId")
-              withContext(dispatcherProvider.main()) { configsLoadedCallback(false) }
-            }
+      composition.retrieveCompositionSections().forEach { sectionComponent ->
+        if (sectionComponent.hasFocus()) {
+          addBinaryToConfigsJsonMap(
+            sectionComponent.focus,
+            configsLoadedCallback,
+          )
+        }
+        if (sectionComponent.hasEntry() && sectionComponent.entry.isNotEmpty()) {
+          sectionComponent.entry.forEach { entryReference ->
+            addBinaryToConfigsJsonMap(
+              entryReference,
+              configsLoadedCallback,
+            )
           }
         }
       }
@@ -356,6 +358,26 @@ constructor(
     configsLoadedCallback(true)
   }
 
+  private suspend fun addBinaryToConfigsJsonMap(
+    entryReference: Reference,
+    configsLoadedCallback: (Boolean) -> Unit,
+  ) {
+    if (entryReference.hasReferenceElement() && entryReference.hasIdentifier()) {
+      val configIdentifier = entryReference.identifier.value
+      val referenceResourceType = entryReference.reference.substringBefore(TYPE_REFERENCE_DELIMITER)
+      if (isAppConfig(referenceResourceType) && !isIconConfig(configIdentifier)) {
+        val extractedId = entryReference.extractId()
+        try {
+          val configBinary = fhirEngine.get<Binary>(extractedId.toString())
+          configsJsonMap[configIdentifier] = configBinary.content.decodeToString()
+        } catch (resourceNotFoundException: ResourceNotFoundException) {
+          Timber.e("Missing Binary file with ID :$extractedId")
+          withContext(dispatcherProvider.main()) { configsLoadedCallback(false) }
+        }
+      }
+    }
+  }
+
   private fun isAppConfig(referenceResourceType: String) =
     referenceResourceType in arrayOf(ResourceType.Binary.name, ResourceType.Parameters.name)
 
@@ -413,41 +435,30 @@ constructor(
       val parsedAppId = appId.substringBefore(TYPE_REFERENCE_DELIMITER).trim()
       val compositionResource = fetchRemoteCompositionByAppId(parsedAppId)
       compositionResource?.let { composition ->
-        composition
-          .retrieveCompositionSections()
-          .asSequence()
-          .filter { it.hasFocus() && it.focus.hasReferenceElement() }
-          .groupBy { section ->
-            section.focus.reference.substringBefore(
-              TYPE_REFERENCE_DELIMITER,
-              missingDelimiterValue = "",
-            )
+        val compositionSections = composition.retrieveCompositionSections()
+        val sectionComponentMap = mutableMapOf<String, MutableList<Composition.SectionComponent>>()
+        compositionSections.forEach { sectionComponent ->
+          if (sectionComponent.hasFocus() && sectionComponent.focus.hasReferenceElement()) {
+            val key =
+              sectionComponent.focus.reference.substringBefore(
+                delimiter = TYPE_REFERENCE_DELIMITER,
+                missingDelimiterValue = "",
+              )
+            sectionComponentMap.getOrPut(key) { mutableListOf() }.apply { add(sectionComponent) }
           }
-          .filter { entry -> entry.key in FILTER_RESOURCE_LIST }
-          .forEach { entry: Map.Entry<String, List<Composition.SectionComponent>> ->
-            if (entry.key == ResourceType.List.name) {
-              processCompositionListResources(entry)
-            } else {
-              val chunkedResourceIdList = entry.value.chunked(MANIFEST_PROCESSOR_BATCH_SIZE)
-
-              chunkedResourceIdList.forEach { sectionComponents ->
-                Timber.d(
-                  "Fetching config resource ${entry.key}: with ids ${
-                                        sectionComponents.joinToString(
-                                            ",",
-                                        )
-                                    }",
-                )
-                fetchResources(
-                  resourceType = entry.key,
-                  resourceIdList =
-                    sectionComponents.map { sectionComponent ->
-                      sectionComponent.focus.extractId()
-                    },
+          if (sectionComponent.hasEntry() && sectionComponent.entry.isNotEmpty()) {
+            sectionComponent.entry.forEach {
+              val key =
+                it.reference.substringBefore(
+                  delimiter = TYPE_REFERENCE_DELIMITER,
+                  missingDelimiterValue = "",
                 )
-              }
+              sectionComponentMap.getOrPut(key) { mutableListOf() }.apply { add(sectionComponent) }
             }
           }
+        }
+
+        processCompositionSectionComponent(sectionComponentMap)
 
         // Save composition after fetching all the referenced section resources
         addOrUpdate(compositionResource)
@@ -457,6 +468,35 @@ constructor(
     }
   }
 
+  private suspend fun processCompositionSectionComponent(
+    sectionComponentMap: Map<String, List<Composition.SectionComponent>>,
+  ) {
+    sectionComponentMap
+      .filter { entry -> entry.key in FILTER_RESOURCE_LIST }
+      .forEach { entry: Map.Entry<String, List<Composition.SectionComponent>> ->
+        if (entry.key == ResourceType.List.name) {
+          processCompositionListResources(entry)
+        } else {
+          val chunkedResourceIdList = entry.value.chunked(MANIFEST_PROCESSOR_BATCH_SIZE)
+
+          chunkedResourceIdList.forEach { sectionComponents ->
+            Timber.d(
+              "Fetching config resource ${entry.key}: with ids ${
+                                sectionComponents.joinToString(
+                                    ",",
+                                )
+                            }",
+            )
+            fetchResources(
+              resourceType = entry.key,
+              resourceIdList =
+                sectionComponents.map { sectionComponent -> sectionComponent.focus.extractId() },
+            )
+          }
+        }
+      }
+  }
+
   suspend fun fetchRemoteImplementationGuideByAppId(
     appId: String?,
     appVersionCode: Int?,
@@ -636,11 +676,11 @@ constructor(
   }
 
   @VisibleForTesting
-   fun saveLastConfigUpdatedTimestamp(resource: Resource) {
+  fun saveLastConfigUpdatedTimestamp(resource: Resource) {
     sharedPreferencesHelper.write(
       lastConfigUpdatedTimestampKey(
         resource.resourceType.name.uppercase(),
-        resource.id.extractLogicalIdUuid(),
+        resource.logicalId,
       ),
       resource.meta?.lastUpdated?.toTimeZoneString(),
     )
@@ -656,8 +696,9 @@ constructor(
   fun setNonProxy(nonProxy: Boolean) {
     _isNonProxy = nonProxy
   }
+
   @VisibleForTesting
-   fun generateRequestBundle(resourceType: String, idList: List<String>): Bundle {
+  fun generateRequestBundle(resourceType: String, idList: List<String>): Bundle {
     val bundleEntryComponents = mutableListOf<Bundle.BundleEntryComponent>()
 
     idList.forEach {
@@ -678,7 +719,8 @@ constructor(
     }
   }
 
-  private fun getLastConfigUpdatedTimestampParam(resourceType: String, resourceId: String): String {
+  @VisibleForTesting
+  fun getLastConfigUpdatedTimestampParam(resourceType: String, resourceId: String): String {
     val timestamp =
       sharedPreferencesHelper
         .read(lastConfigUpdatedTimestampKey(resourceType.uppercase(), resourceId), "")
@@ -695,7 +737,11 @@ constructor(
       entry =
         resourceIds
           .map {
-            fhirResourceDataSource.getResource("$resourceType?${Composition.SP_RES_ID}=$it").entry
+            fhirResourceDataSource
+              .getResource(
+                "$resourceType?${Composition.SP_RES_ID}=$it${getLastConfigUpdatedTimestampParam(resourceType, it)}",
+              )
+              .entry
           }
           .flatten()
     }
diff --git a/android/engine/src/main/res/values-fr/strings.xml b/android/engine/src/main/res/values-fr/strings.xml
index c6da7575988..f4370ff398a 100644
--- a/android/engine/src/main/res/values-fr/strings.xml
+++ b/android/engine/src/main/res/values-fr/strings.xml
@@ -24,7 +24,7 @@
     <string name="sync_completed">Synchronisation terminée</string>
     <string name="syncing">Synchronisation</string>
     <string name="syncing_up" >Synchronisation&#8230;</string>
-    <string name="syncing_down" >Synchronisation en cours&#8230;</string>
+    <string name="syncing_down" >Synchronisation&#8230;</string>
     <string name="syncing_initiated">Synchronisation initiée&#8230;</string>
     <string name="sync_failed">La synchronisation a échoué. Vérifier la connexion internet ou réessayer plus tard</string>
     <string name="sync_completed_with_errors">La synchronisation s\'est terminée avec des erreurs. Réessayer...</string>
@@ -55,7 +55,7 @@
     <string name="syncing_retry">Réessayer la synchronisation</string>
     <string name="syncing_in_progress">Synchronisation en cours</string>
     <string name="loading">Chargement</string>
-    <string name="loading_ellipsis">Chargement…</string>
+    <string name="loading_ellipsis">Chargement</string>
     <string name="error_logging_out">Message d\'erreur de déconnexion %1$s</string>
     <string name="cannot_logout_user">Impossible de se déconnecter : Déjà déconnecté ou l\'appareil est hors ligne.</string>
     <string name="error_loading_config_http_error">Impossible de charger la configuration. Veuillez réessayer plus tard</string>
@@ -75,6 +75,8 @@
     <string name="questionnaire_alert_invalid_message">Des erreurs de validation ont été détectées. Corrigez les erreurs et soumettez à nouveau.</string>
     <string name="questionnaire_alert_invalid_title">Échec de la validation</string>
     <string name="questionnaire_alert_ack_button_title">D\'ACCORD</string>
+    <string name="questionnaire_alert_open_draft_button_title">Projet ouvert</string>
+    <string name="questionnaire_alert_delete_draft_button_title">Supprimer le projet</string>
     <string name="username">Nom d\'utilisateur</string>
     <string name="password">Mot de passe</string>
     <string name="forgot_password">Mot de passe oublié</string>
@@ -184,4 +186,6 @@
     <string name="apply_filter">APPLIQUER LE FILLTRE</string>
     <string name="questionnaire_save_draft_title">Enregistrer les modifications du brouillon</string>
     <string name="questionnaire_save_draft_message">Voulez-vous enregistrer les modifications du brouillon ?</string>
+    <string name="open_draft_changes_title">Modifications du projet en cours</string>
+    <string name="open_draft_changes_message">Vous pouvez rouvrir un projet de formulaire enregistré pour le poursuivre ou le supprimer</string>
 </resources>
diff --git a/android/engine/src/main/res/values-in/strings.xml b/android/engine/src/main/res/values-in/strings.xml
index 9e674f4fc50..d7d55b464b5 100644
--- a/android/engine/src/main/res/values-in/strings.xml
+++ b/android/engine/src/main/res/values-in/strings.xml
@@ -1,9 +1,12 @@
 <resources>
     <string name="manual_sync">Sinkronisasi manual</string>
+    <string name="sync">Sinkronkan</string>
     <string name="language">Bahasa</string>
     <string name="logout_as_user">Keluar sebagai </string>
     <string name="show_overdue">Tampilkan yang terlambat</string>
     <string name="search_hint">Cari nama atau nomor ID</string>
+    <string name="search">Cari nama</string>
+    <string name="sync_data">SINKRONKAN DATA</string>
     <string name="scan_bar_code">PINDAI BARCODE</string>
     <string name="empty_client_list_message_title">Tidak Ada Hasil</string>
     <string name="empty_client_list_message_details">Maaf, kami tidak dapat menemukan klien dengan nama atau nomor ID tersebut</string>
@@ -65,12 +68,15 @@
     <string name="questionnaire_in_progress_alert_back_pressed_message">Apakah Anda yakin ingin membuang jawabannya?</string>
     <string name="questionnaire_alert_back_pressed_title">Buang perubahan</string>
     <string name="questionnaire_alert_back_pressed_button_title">Buang</string>
-    <string name="questionnaire_alert_back_pressed_save_draft_button_title">Simpan sebagian draf</string>
+    <string name="questionnaire_alert_back_pressed_save_draft_button_title">Simpan sebagai draf</string>
     <string name="questionnaire_alert_neutral_button_title">Batal</string>
+    <string name="questionnaire_alert_negative_button_title">Batalkan Perubahan</string>
     <string name="questionnaire_alert_confirm_button_title">Ya</string>
     <string name="questionnaire_alert_invalid_message">Detail yang diberikan mengalami kesalahan validasi. Atasi kesalahan dan kirim lagi</string>
     <string name="questionnaire_alert_invalid_title">Validasi Gagal</string>
     <string name="questionnaire_alert_ack_button_title">OK</string>
+    <string name="questionnaire_alert_open_draft_button_title">Buka draf</string>
+    <string name="questionnaire_alert_delete_draft_button_title">Hapus draf</string>
     <string name="username">Username</string>
     <string name="password">Password</string>
     <string name="forgot_password">Lupa Password</string>
@@ -123,6 +129,7 @@
     <string name="upcoming_services">PELAYANAN SELANJUTNYA</string>
     <string name="service_card">KARTU PELAYANAN</string>
     <string name="other_patients">Pasien lainnya</string>
+    <string name="select_location">Pilih lokasi</string>
     <string name="responses">RESPONS (%1$s)</string>
     <string name="multi_user_login_attempt">Mencoba masuk dengan pengguna lain</string>
     <string name="please_wait">Mohon tunggu...</string>
@@ -144,6 +151,7 @@
     <string name="weeks">Pekan/minggu</string>
     <string name="days">Hari</string>
     <string name="initializing">Menginisiasi pengaturan &#8230;</string>
+    <string name="initializing_application">Initializing application &#8230;</string>
     <string name="username_sample" translatable="false">e.g JohnDoe</string>
     <string name="percentage_progress" translatable="false">%1$d%%</string>
     <string name="error_occurred">Ada yang salah...</string>
@@ -157,6 +165,7 @@
     <string name="device_info">Info perangkat</string>
     <string name="refresh">Muat ulang</string>
     <string name="unsynced_resources">Resources Tidak Disinkronkan</string>
+    <string name="all_resources_synced">Semua data telah tersinkronisasi</string>
     <string name="synced_statistics">Statistik Tersinkronisasi</string>
     <string name="all_data_synced">Semua data disinkronkan</string>
     <string name="invalid_offline_login_state">Diperlukan pengaturan pengguna. Aktifkan koneksi internet Anda</string>
@@ -175,4 +184,25 @@
     <string name="device_date">Tanggal</string>
     <string name="device">Perangkat</string>
     <string name="data_migration_version">Versi migrasi data</string>
+    <string name="ok">Oke</string>
+    <string name="add">TAMBAH</string>
+    <string name="data_migration_started">Memulai migrasi data dari versi %1$d</string>
+    <string name="data_migration_completed">Data aplikasi berhasil dimigrasikan ke versi %1$d</string>
+    <string name="help">Bantu</string>
+    <string name="no_data">Tidak ada data yang disetel</string>
+    <string name="sync_complete">Sinkronisasi selesai</string>
+    <string name="sync_error">Kesalahan sinkronisasi</string>
+    <string name="minutes_remaining">Menghitung sisa waktu dalam menit…</string>
+    <string name="sync_up_inprogress">%1$d%% Sinkronisasi ke atas…</string>
+    <string name="sync_down_inprogress">%1$d%% Sinkronisasi ke bawah…</string>
+    <string name="retry">COBA LAGI</string>
+    <string name="unsynced_data_present">Ada beberapa data yang belum tersinkronisasi</string>
+    <string name="missing_supervisor_contact">Kontak supervisor hilang atau nomor telepon yang diberikan tidak valid</string>
+    <string name="apply_filter">TERAPKAN FILTER</string>
+    <string name="questionnaire_save_draft_title">Simpan perubahan draf</string>
+    <string name="questionnaire_save_draft_message">Apakah Anda ingin menyimpan perubahan draf?</string>
+    <string name="open_draft_changes_title">Buka perubahan draf</string>
+    <string name="open_draft_changes_message">Anda dapat membuka kembali formulir draf yang disimpan untuk melanjutkan atau menghapusnya</string>
+    <string name="button_pagination_next">Berikutnya</string>
+    <string name="button_pagination_previous">Sebelumnya</string>
 </resources>
diff --git a/android/engine/src/test/java/org/smartregister/fhircore/engine/configuration/ConfigurationRegistryTest.kt b/android/engine/src/test/java/org/smartregister/fhircore/engine/configuration/ConfigurationRegistryTest.kt
index c1487341730..d28f3a41380 100644
--- a/android/engine/src/test/java/org/smartregister/fhircore/engine/configuration/ConfigurationRegistryTest.kt
+++ b/android/engine/src/test/java/org/smartregister/fhircore/engine/configuration/ConfigurationRegistryTest.kt
@@ -24,6 +24,7 @@ import com.google.android.fhir.FhirEngine
 import com.google.android.fhir.SearchResult
 import com.google.android.fhir.datacapture.extensions.logicalId
 import com.google.android.fhir.db.ResourceNotFoundException
+import com.google.android.fhir.get
 import com.google.android.fhir.search.Search
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
@@ -32,6 +33,7 @@ import io.mockk.coEvery
 import io.mockk.coVerify
 import io.mockk.mockk
 import io.mockk.spyk
+import java.util.Date
 import javax.inject.Inject
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.runTest
@@ -79,7 +81,6 @@ import org.smartregister.fhircore.engine.util.SharedPreferencesHelper
 import org.smartregister.fhircore.engine.util.extension.getPayload
 import org.smartregister.fhircore.engine.util.extension.second
 import org.smartregister.fhircore.engine.util.extension.toTimeZoneString
-import java.util.Date
 
 @HiltAndroidTest
 class ConfigurationRegistryTest : RobolectricTest() {
@@ -621,7 +622,7 @@ class ConfigurationRegistryTest : RobolectricTest() {
     } returns Binary().apply { content = ByteArray(0) }
     runTest { configRegistry.loadConfigurations(appId, context) }
 
-    Assert.assertFalse(configRegistry.configsJsonMap.isEmpty())
+    assertFalse(configRegistry.configsJsonMap.isEmpty())
   }
 
   @Test
@@ -1084,12 +1085,144 @@ class ConfigurationRegistryTest : RobolectricTest() {
       assertEquals(questionnaireId, questionnaire.logicalId)
     }
   }
+
+  @Test
+  fun testFetchNonWorkflowConfigResourcesWithNoFocusOrEntry() = runTest {
+    val appId = "app-id"
+    val composition =
+      Composition().apply {
+        identifier = Identifier().apply { value = appId }
+        section = listOf(SectionComponent()) // Neither focus nor entry
+      }
+
+    configRegistry.fetchNonWorkflowConfigResources()
+
+    // Validate no crash occurs and configsJsonMap remains empty
+    assertTrue(configRegistry.configsJsonMap.isEmpty())
+  }
+
+  @Test
+  fun testPopulateConfigurationsMapWithNeitherFocusNorEntry() = runTest {
+    val composition = Composition()
+
+    configRegistry.populateConfigurationsMap(context, composition, false, "app-id") {}
+
+    assertTrue(configRegistry.configsJsonMap.isEmpty())
+  }
+
+  @Test
+  fun testPopulateConfigurationsMapWithAllFocus() = runTest {
+    val composition =
+      Composition().apply {
+        section =
+          listOf(
+            SectionComponent().apply {
+              focus =
+                Reference().apply {
+                  reference = "Binary/1"
+                  identifier = Identifier().apply { value = "resource1" }
+                }
+            },
+          )
+      }
+
+    coEvery { fhirEngine.get<Binary>(any()) } returns Binary().apply { content = ByteArray(0) }
+    configRegistry.populateConfigurationsMap(context, composition, false, "app-id") {}
+    assertEquals(1, configRegistry.configsJsonMap.size)
+    assertTrue(configRegistry.configsJsonMap.containsKey("resource1"))
+  }
+
+  @Test
+  fun testPopulateConfigurationsMapWithAllEntry() = runTest {
+    val composition =
+      Composition().apply {
+        section =
+          listOf(
+            SectionComponent().apply {
+              entry =
+                listOf(
+                  Reference().apply {
+                    reference = "Binary/1"
+                    identifier = Identifier().apply { value = "resource1" }
+                  },
+                  Reference().apply {
+                    reference = "Binary/2"
+                    identifier = Identifier().apply { value = "resource2" }
+                  },
+                )
+            },
+          )
+      }
+
+    coEvery { fhirEngine.get<Binary>(any()) } returns Binary().apply { content = ByteArray(0) }
+    configRegistry.populateConfigurationsMap(context, composition, false, "app-id") {}
+    assertEquals(2, configRegistry.configsJsonMap.size)
+    assertTrue(configRegistry.configsJsonMap.containsKey("resource1"))
+    assertTrue(configRegistry.configsJsonMap.containsKey("resource2"))
+  }
+
+  @Test
+  fun testPopulateConfigurationsMapWithEntryMissingId() = runTest {
+    val composition =
+      Composition().apply {
+        section =
+          listOf(
+            SectionComponent().apply {
+              entry =
+                listOf(
+                  Reference().apply { reference = "Binary/1" },
+                  Reference().apply {
+                    reference = "Binary/2"
+                    identifier = Identifier().apply { value = "resource2" }
+                  },
+                )
+            },
+          )
+      }
+
+    coEvery { fhirEngine.get<Binary>(any()) } returns Binary().apply { content = ByteArray(0) }
+    configRegistry.populateConfigurationsMap(context, composition, false, "app-id") {}
+    assertEquals(1, configRegistry.configsJsonMap.size)
+    assertTrue(configRegistry.configsJsonMap.containsKey("resource2"))
+  }
+
+  @Test
+  fun testPopulateConfigurationsMapWithFocusAndEntry() = runTest {
+    val composition =
+      Composition().apply {
+        section =
+          listOf(
+            SectionComponent().apply {
+              focus =
+                Reference().apply {
+                  reference = "Binary/1"
+                  identifier = Identifier().apply { value = "resource1" }
+                }
+              entry =
+                listOf(
+                  Reference().apply {
+                    reference = "Binary/2"
+                    identifier = Identifier().apply { value = "resource2" }
+                  },
+                )
+            },
+          )
+      }
+
+    coEvery { fhirEngine.get<Binary>(any()) } returns Binary().apply { content = ByteArray(0) }
+    configRegistry.populateConfigurationsMap(context, composition, false, "app-id") {}
+    assertEquals(2, configRegistry.configsJsonMap.size)
+    assertTrue(configRegistry.configsJsonMap.containsKey("resource1"))
+    assertTrue(configRegistry.configsJsonMap.containsKey("resource2"))
+  }
+
   @Test
   fun testSaveLastConfigUpdatedTimestamp() {
-    val resource = Binary().apply {
-      id = "test-binary-id"
-      meta = Meta().setLastUpdated(Date())
-    }
+    val resource =
+      Binary().apply {
+        id = "test-binary-id"
+        meta = Meta().setLastUpdated(Date())
+      }
 
     val expectedKey = "BINARY_test-binary-id_LAST_CONFIG_SYNC_TIMESTAMP"
     val expectedValue = resource.meta.lastUpdated.toTimeZoneString()
@@ -1111,8 +1244,7 @@ class ConfigurationRegistryTest : RobolectricTest() {
   }
 
   @Test
-  fun testGenerateRequestBundleIncludesLastUpdated() {
-
+  fun testGetLastConfigUpdatedTimestampParam() {
     val resourceType = "BINARY"
     val resourceId = "test-binary-id"
     val timestamp = "2024-01-15T10:00:00Z"
@@ -1120,47 +1252,62 @@ class ConfigurationRegistryTest : RobolectricTest() {
 
     configRegistry.sharedPreferencesHelper.write(expectedKey, timestamp)
 
+    val result = configRegistry.getLastConfigUpdatedTimestampParam(resourceType, resourceId)
+    assertEquals("&_lastUpdated=gt2024-01-15T10:00:00Z", result)
+  }
 
-    val resultBundle = configRegistry.generateRequestBundle(resourceType, listOf(resourceId))
+  @Test
+  fun testGetLastConfigUpdatedTimestampParamWithNoLastUpdated() {
+    val resourceType = "BINARY"
+    val resourceId = "test-binary-id"
+
+    val result = configRegistry.getLastConfigUpdatedTimestampParam(resourceType, resourceId)
+
+    assertEquals("", result)
+  }
 
+  @Test
+  fun testGenerateRequestBundleIncludesLastUpdated() {
+    val resourceType = "BINARY"
+    val resourceId = "test-binary-id"
+    val timestamp = "2024-01-15T10:00:00Z"
+    val expectedKey = "${resourceType}_${resourceId}_LAST_CONFIG_SYNC_TIMESTAMP"
+
+    configRegistry.sharedPreferencesHelper.write(expectedKey, timestamp)
+
+    val resultBundle = configRegistry.generateRequestBundle(resourceType, listOf(resourceId))
 
     assertEquals(
       "$resourceType?_id=$resourceId&_lastUpdated=gt$timestamp",
-      resultBundle.entry.first().request.url
+      resultBundle.entry.first().request.url,
     )
   }
 
   @Test
   fun testGenerateRequestBundleWithNoLastUpdated() {
-
     val resourceType = "BINARY"
     val resourceId = "test-binary-id"
 
-
     val resultBundle = configRegistry.generateRequestBundle(resourceType, listOf(resourceId))
 
-
     assertEquals(
       "$resourceType?_id=$resourceId",
-      resultBundle.entry.first().request.url
+      resultBundle.entry.first().request.url,
     )
   }
 
   @Test
   fun testCreateOrUpdateRemoteUpdatesTimestamp() = runTest {
-
-    val resource = Binary().apply {
-      id = "test-binary-id"
-      meta = Meta().setLastUpdated(Date())
-    }
+    val resource =
+      Binary().apply {
+        id = "test-binary-id"
+        meta = Meta().setLastUpdated(Date())
+      }
     val expectedKey = "BINARY_test-binary-id_LAST_CONFIG_SYNC_TIMESTAMP"
 
-
     configRegistry.createOrUpdateRemote(resource)
 
-
     val savedTimestamp = configRegistry.sharedPreferencesHelper.read(expectedKey, "")
     assertFalse(savedTimestamp.isNullOrEmpty())
   }
-
 }
diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml
index 90702e4b7c7..8a5199492ad 100644
--- a/android/gradle/libs.versions.toml
+++ b/android/gradle/libs.versions.toml
@@ -142,6 +142,7 @@ junit = { group = "androidx.test.ext", name = "junit", version.ref = "junit" }
 junit-jupiter-api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junit-jupiter" }
 junit-jupiter-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "junit-jupiter" }
 junit-ktx = { group = "androidx.test.ext", name = "junit-ktx", version.ref = "junit-ktx" }
+junit-platform-launcher = { group = "org.junit.platform", name = "junit-platform-launcher"}
 junit-vintage-engine = { group = "org.junit.vintage", name = "junit-vintage-engine", version.ref = "junit-jupiter" }
 knowledge = { group = "org.smartregister", name = "knowledge", version.ref = "fhir-sdk-knowledge" }
 kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
@@ -222,7 +223,7 @@ compose = ["activity-compose","activity-ktx", "ui", "ui-tooling-preview", "const
 compose-ui-test = ["ui-test-junit4","ui-test-manifest"]
 coroutines = ["kotlinx-coroutines-core", "kotlinx-coroutines-android"]
 datastore-kt = ["datastore-preferences", "datastore"]
-junit-jupiter-runtime = ["junit-jupiter-engine","junit-vintage-engine"]
+junit-jupiter-runtime = ["junit-platform-launcher", "junit-jupiter-engine","junit-vintage-engine"]
 junit-test = ["junit-ktx", "junit"]
 klint = ["ktlint-cli-ruleset", "ktlint-rule-engine-core"]
 lifecycle = ["lifecycle-viewmodel-ktx", "lifecycle-viewmodel-compose", "lifecycle-livedata-ktx"]
diff --git a/android/quest/build.gradle.kts b/android/quest/build.gradle.kts
index 6baf09f5a1b..cd1fc372fd5 100644
--- a/android/quest/build.gradle.kts
+++ b/android/quest/build.gradle.kts
@@ -378,7 +378,7 @@ android {
       dimension = "apps"
       applicationIdSuffix = ".jobaids"
       versionNameSuffix = "-kaderjobaids"
-      manifestPlaceholders["appLabel"] = "Kader Job Aids"
+      manifestPlaceholders["appLabel"] = "Kader Kesehatan"
     }
   }
 
diff --git a/android/quest/src/kaderjobaids/res/drawable/ic_app_logo.png b/android/quest/src/kaderjobaids/res/drawable/ic_app_logo.png
index 8caf2e3da25..3a0f7e0617d 100644
Binary files a/android/quest/src/kaderjobaids/res/drawable/ic_app_logo.png and b/android/quest/src/kaderjobaids/res/drawable/ic_app_logo.png differ
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/components/TopScreenSection.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/components/TopScreenSection.kt
index 29c14d7acc6..cf12ec26452 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/components/TopScreenSection.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/components/TopScreenSection.kt
@@ -146,7 +146,7 @@ fun TopScreenSection(
       verticalAlignment = Alignment.CenterVertically,
       horizontalArrangement = Arrangement.SpaceBetween,
     ) {
-      Row(verticalAlignment = Alignment.CenterVertically) {
+      Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.weight(4f)) {
         Icon(
           when (toolBarHomeNavigation) {
             ToolBarHomeNavigation.OPEN_DRAWER -> Icons.Filled.Menu
@@ -169,7 +169,7 @@ fun TopScreenSection(
 
       Row(
         verticalAlignment = Alignment.CenterVertically,
-        modifier = Modifier.padding(start = 8.dp),
+        modifier = Modifier.padding(start = 8.dp).weight(1f),
       ) {
         SetupToolbarIcons(
           menuIcons = topScreenSection?.menuIcons,
@@ -412,7 +412,7 @@ private fun RenderMenuIcon(
 @Composable
 fun TopScreenSectionWithFilterItemOverNinetyNinePreview() {
   TopScreenSection(
-    title = "All Clients",
+    title = "All Clients All Clients All Clients All Clients All Clients",
     searchQuery = SearchQuery("Eddy"),
     filteredRecordsCount = 120,
     onSearchTextChanged = { _, _ -> },
diff --git a/android/quest/src/main/res/values-fr/strings.xml b/android/quest/src/main/res/values-fr/strings.xml
index c8d989da499..491e08ba699 100644
--- a/android/quest/src/main/res/values-fr/strings.xml
+++ b/android/quest/src/main/res/values-fr/strings.xml
@@ -119,6 +119,7 @@
     <string name="invalid_base_resource">La ressource de base pour la configuration du GeoWidget DOIT être l\'emplacement.</string>
     <string name="no_search_coonfigs_provided">Aucune configuration fournie pour la barre de recherche.</string>
     <string name="no_found_locations_matching_text">Aucun emplacement trouvé correspondant au texte \"%1$s\"</string>
+    <string name="open_choice_other_hint">Autre</string>
     <string name="qr_code">code_QR</string>
     <string name="barcode_camera_permission_denied">Demande d\'autorisation de caméra refusée. Le code-barres pourrait ne pas fonctionner comme prévu.</string>
     <string name="prompt_point_at_a_barcode">Placez votre caméra sur le code QR pour commencer à scanner.</string>
@@ -133,6 +134,9 @@
     <string name="all_locations_rendered"><b>Tous</b> Les emplacements ont été rendus avec succès\"</string>
     <string name="all_matching_locations_rendered"><b>%1$d </b> Les emplacements correspondants ont été rendus avec succès.</string>
     <string name="on_cancel_adding_location">Annuler l\'ajout de l\'emplacement</string>
+    <string name="error_rendering_profile">Erreur de rendu du profil</string>
+    <string name="questionnaire_submission_confirmation_message">Êtes-vous sûr de vouloir soumettre?</string>
+    <string name="questionnaire_submission_confirmation_title">Vous êtes sur le point de soumettre</string>
 
     <!-- SDK SDC Strings -->
 
@@ -182,7 +186,6 @@
 
     <!-- 2.4 Multi Select / Open Choice -->
     <string name="open_choice_other">Autre</string>
-    <string name="open_choice_other_hint">Saisissez une option personnalisée</string>
     <string name="open_choice_other_add_another">Ajouter une autre réponse</string>
     <string name="multi_select_dialog_subtitle">Cochez toutes les cases qui s\'appliquent</string>
     <string name="save">Sauvegardez</string>