diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 01406d99ec..132b0fe915 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -49,6 +49,7 @@ jobs:
     permissions:
       actions: read
       contents: read
+      packages: write
 
     strategy:
       fail-fast: false
@@ -75,9 +76,21 @@ jobs:
       - name: Check with Gradle
         run: ./gradlew check --scan --full-stacktrace
 
+      - name: Publish Maven packages to GitHub Packages
+        if: ${{ github.event_name == 'push' }}
+        run: ./gradlew publish
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          REPOSITORY_URL: 'https://maven.pkg.github.com/google/android-fhir'
+          # Use SNAPSHOT Prefix to follow Maven convention
+          ARTIFACT_VERSION_SUFFIX: SNAPSHOT
+
       - name: Release artifacts to local repo
         run: ./gradlew publishReleasePublicationToCIRepository --scan
-      - name: Upload maven repo
+        env:
+          ARTIFACT_VERSION_SUFFIX: build_${{ github.run_id }}
+
+      - name: Upload artifact maven-repository.zip
         uses: actions/upload-artifact@v4
         with:
           name: maven-repository
@@ -118,7 +131,7 @@ jobs:
 
       - name: Setup GitHub Pages
         if: ${{ github.event_name == 'push' }}
-        uses: actions/configure-pages@v4
+        uses: actions/configure-pages@v5
 
       - name: Upload site/ directory as GitHub Pages artifact
         if: ${{ github.event_name == 'push' }}
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 4dec42c493..0f48d57a24 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -19,5 +19,5 @@ dependencies {
   implementation("com.spotify.ruler:ruler-gradle-plugin:1.4.0")
 
   implementation("ca.uhn.hapi.fhir:hapi-fhir-structures-r4:6.10.0")
-  implementation("com.squareup:kotlinpoet:1.15.3")
+  implementation("com.squareup:kotlinpoet:1.17.0")
 }
diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index 69ed05d2de..89e5b6c34d 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -119,20 +119,33 @@ fun Project.publishArtifact(artifact: LibraryArtifact) {
             licenses {
               license {
                 name.set("The Apache License, Version 2.0")
-                url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
+                url.set("https://www.apache.org/licenses/LICENSE-2.0.txt")
               }
             }
           }
           repositories {
             maven {
               name = "CI"
-              url = uri("file://${rootProject.buildDir}/ci-repo")
+              url =
+                if (System.getenv("REPOSITORY_URL") != null) {
+                  // REPOSITORY_URL is defined in .github/workflows/build.yml
+                  uri(System.getenv("REPOSITORY_URL"))
+                } else {
+                  uri("file://${rootProject.buildDir}/ci-repo")
+                }
               version =
                 if (project.providers.environmentVariable("GITHUB_ACTIONS").isPresent) {
-                  "${artifact.version}-build_${System.getenv("GITHUB_RUN_ID")}"
+                  // ARTIFACT_VERSION_SUFFIX is defined in .github/workflows/build.yml
+                  "${artifact.version}-${System.getenv("ARTIFACT_VERSION_SUFFIX")}"
                 } else {
                   artifact.version
                 }
+              if (System.getenv("GITHUB_TOKEN") != null) {
+                credentials {
+                  username = System.getenv("GITHUB_ACTOR")
+                  password = System.getenv("GITHUB_TOKEN")
+                }
+              }
             }
           }
         }
diff --git a/catalog/build.gradle.kts b/catalog/build.gradle.kts
index 3287f3b4d8..2e1fe9a966 100644
--- a/catalog/build.gradle.kts
+++ b/catalog/build.gradle.kts
@@ -22,8 +22,8 @@ android {
 
   buildTypes {
     release {
-      isMinifyEnabled = false
-      proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"))
+      isMinifyEnabled = true
+      proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
     }
   }
   compileOptions {
diff --git a/catalog/proguard-rules.pro b/catalog/proguard-rules.pro
new file mode 100644
index 0000000000..0deded0be5
--- /dev/null
+++ b/catalog/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.kts
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/catalog/src/main/java/com/google/android/fhir/catalog/ModalBottomSheetFragment.kt b/catalog/src/main/java/com/google/android/fhir/catalog/ModalBottomSheetFragment.kt
index ab5c488ffb..5c2ca4d0fb 100644
--- a/catalog/src/main/java/com/google/android/fhir/catalog/ModalBottomSheetFragment.kt
+++ b/catalog/src/main/java/com/google/android/fhir/catalog/ModalBottomSheetFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 Google LLC
+ * Copyright 2021-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +20,9 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
+import android.widget.CheckBox
 import androidx.core.os.bundleOf
 import androidx.fragment.app.setFragmentResult
-import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.fragment.navArgs
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 
@@ -40,25 +39,16 @@ class ModalBottomSheetFragment : BottomSheetDialogFragment() {
 
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     super.onViewCreated(view, savedInstanceState)
-    val showHideErrorButton = view.findViewById<Button>(R.id.errorToggleButton)
-    showHideErrorButton.text =
-      requireContext()
-        .getString(
-          if (args.errorState) {
-            R.string.hide_error_state
-          } else {
-            R.string.show_error_state
-          },
-        )
-    showHideErrorButton.setOnClickListener {
+
+    val showHideErrorCheckBox = view.findViewById<CheckBox>(R.id.errorToggleCheckBox)
+    showHideErrorCheckBox.isChecked = args.errorState
+    showHideErrorCheckBox.setOnCheckedChangeListener { _, isChecked ->
       setFragmentResult(
         REQUEST_ERROR_KEY,
         bundleOf(
-          BUNDLE_ERROR_KEY to
-            (showHideErrorButton.text == requireContext().getString(R.string.show_error_state)),
+          BUNDLE_ERROR_KEY to isChecked,
         ),
       )
-      NavHostFragment.findNavController(this).navigateUp()
     }
     (activity as? MainActivity)?.showOpenQuestionnaireMenu(false)
   }
diff --git a/catalog/src/main/res/layout/fragment_modal_bottom_sheet.xml b/catalog/src/main/res/layout/fragment_modal_bottom_sheet.xml
index 1fefa98520..c0b265db98 100644
--- a/catalog/src/main/res/layout/fragment_modal_bottom_sheet.xml
+++ b/catalog/src/main/res/layout/fragment_modal_bottom_sheet.xml
@@ -7,7 +7,6 @@
     android:layout_height="match_parent"
     tools:context=".ModalBottomSheetFragment"
 >
-
   <TextView
         android:id="@+id/optionsTextView"
         android:layout_width="wrap_content"
@@ -19,13 +18,12 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
     />
-
-  <Button
-        style="@style/Widget.App.MaterialComponents.Button"
-        android:id="@+id/errorToggleButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="60dp"
+  <CheckBox
+        android:id="@+id/errorToggleCheckBox"
+        style="@style/Questionnaire.CheckBoxStyle"
+        android:layout_width="280dp"
+        android:layout_height="68dp"
+        android:layout_marginTop="24dp"
         android:layout_marginBottom="116dp"
         android:text="@string/show_error_state"
         android:textAllCaps="false"
@@ -34,5 +32,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/optionsTextView"
     />
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/catalog/src/main/res/values/strings.xml b/catalog/src/main/res/values/strings.xml
index 8934420572..989e4480fe 100644
--- a/catalog/src/main/res/values/strings.xml
+++ b/catalog/src/main/res/values/strings.xml
@@ -74,7 +74,6 @@
     >Below is the JSON code</string>
     <string name="submit">Submit</string>
     <string name="show_error_state">Show error state</string>
-    <string name="hide_error_state">Hide error state</string>
     <string name="options">Options</string>
     <string name="error">Error</string>
     <string name="widgets">Widgets</string>
diff --git a/datacapture/build.gradle.kts b/datacapture/build.gradle.kts
index 56ec2b54f2..31bf97ba65 100644
--- a/datacapture/build.gradle.kts
+++ b/datacapture/build.gradle.kts
@@ -21,6 +21,7 @@ android {
     testInstrumentationRunner = Dependencies.androidJunitRunner
     // Need to specify this to prevent junit runner from going deep into our dependencies
     testInstrumentationRunnerArguments["package"] = "com.google.android.fhir.datacapture"
+    consumerProguardFile("proguard-rules.pro")
   }
 
   buildFeatures { viewBinding = true }
diff --git a/datacapture/proguard-rules.pro b/datacapture/proguard-rules.pro
new file mode 100644
index 0000000000..8ef05d43fe
--- /dev/null
+++ b/datacapture/proguard-rules.pro
@@ -0,0 +1,11 @@
+## HAPI Strucutres need to be kept beause
+	# 1. Reflection is used in resource extraction as the FHIR Path expression is then translated to field names to locate data elements in FHIR resources.
+	# 2. In HAPI Strucures, ClassLoader is used to load classes from different packages that are hardcoded.
+-keep class ca.uhn.fhir.** { *; }
+-keep class org.hl7.fhir.**  { *; }
+# Used by hapi's XmlUtil which is internally used by hapi's FHIRPathEngine.
+-keep class com.ctc.wstx.stax.**  { *; }
+# Used by HapiWorkerContext (fhirpath engine in QuestionnaireViewModel)
+-keep class com.github.benmanes.caffeine.cache.**  { *; }
+## hapi libs ends
+-ignorewarnings
diff --git a/datacapture/sampledata/component_repeated_group.json b/datacapture/sampledata/component_repeated_group.json
new file mode 100644
index 0000000000..e6af16282e
--- /dev/null
+++ b/datacapture/sampledata/component_repeated_group.json
@@ -0,0 +1,24 @@
+{
+  "resourceType": "Questionnaire",
+  "item": [
+    {
+      "linkId": "1",
+      "type": "group",
+      "text": "Repeated Group",
+      "repeats": true,
+      "item": [
+        {
+          "linkId": "1-1",
+          "text": "Sample date question",
+          "type": "date",
+          "extension": [
+            {
+              "url": "http://hl7.org/fhir/StructureDefinition/entryFormat",
+              "valueString": "yyyy-mm-dd"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/datacapture/sampledata/repeated_group_response.json b/datacapture/sampledata/repeated_group_response.json
new file mode 100644
index 0000000000..9cd8f2828e
--- /dev/null
+++ b/datacapture/sampledata/repeated_group_response.json
@@ -0,0 +1,20 @@
+{
+  "resourceType": "QuestionnaireResponse",
+  "item": [
+    {
+      "linkId": "1",
+      "text": "Repeated Group",
+      "item": [
+        {
+          "linkId": "1-1",
+          "text": "Sample date question",
+          "answer": [
+            {
+              "valueDate": "2024-06-03"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/contrib/views/PhoneNumberViewHolderFactoryInstrumentedTest.kt b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/contrib/views/PhoneNumberViewHolderFactoryInstrumentedTest.kt
index 92c8d1a9d4..be61690e64 100644
--- a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/contrib/views/PhoneNumberViewHolderFactoryInstrumentedTest.kt
+++ b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/contrib/views/PhoneNumberViewHolderFactoryInstrumentedTest.kt
@@ -65,7 +65,7 @@ class PhoneNumberViewHolderFactoryInstrumentedTest {
   }
 
   @Test
-  fun createViewHolder_shouldReturn_phoneNumberViewHolder() {
+  fun createViewHolder_phoneNumberViewHolderFactory_returnsViewHolder() {
     val viewHolderFromAdapter =
       questionnaireEditAdapter.createViewHolder(
         parent,
@@ -74,8 +74,13 @@ class PhoneNumberViewHolderFactoryInstrumentedTest {
             subtype = QuestionnaireViewHolderType.PHONE_NUMBER.value,
           )
           .viewType,
+      ) as QuestionnaireEditAdapter.ViewHolder.QuestionHolder
+    assertThat(
+        viewHolderFromAdapter.holder.itemView
+          .findViewById<TextInputEditText>(R.id.text_input_edit_text)
+          .visibility,
       )
-    assertThat(viewHolderFromAdapter).isInstanceOf(viewHolder::class.java)
+      .isEqualTo(View.VISIBLE)
   }
 
   @Test
diff --git a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/test/QuestionnaireUiEspressoTest.kt b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/test/QuestionnaireUiEspressoTest.kt
index e7bf0d3867..3ca8eb1b21 100644
--- a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/test/QuestionnaireUiEspressoTest.kt
+++ b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/test/QuestionnaireUiEspressoTest.kt
@@ -20,12 +20,18 @@ import android.view.View
 import android.widget.FrameLayout
 import android.widget.TextView
 import androidx.fragment.app.commitNow
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.UiController
+import androidx.test.espresso.ViewAction
 import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.action.ViewActions.typeText
 import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.contrib.RecyclerViewActions
 import androidx.test.espresso.matcher.RootMatchers
 import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.rules.ActivityScenarioRule
@@ -604,24 +610,109 @@ class QuestionnaireUiEspressoTest {
     }
   }
 
+  @Test
+  fun test_repeated_group_is_added() {
+    buildFragmentFromQuestionnaire("/component_repeated_group.json")
+
+    onView(withId(R.id.questionnaire_edit_recycler_view))
+      .perform(
+        RecyclerViewActions.actionOnItemAtPosition<ViewHolder>(
+          0,
+          clickChildViewWithId(R.id.add_item),
+        ),
+      )
+
+    onView(ViewMatchers.withId(R.id.questionnaire_edit_recycler_view)).check {
+      view,
+      noViewFoundException,
+      ->
+      if (noViewFoundException != null) {
+        throw noViewFoundException
+      }
+      assertThat(
+          (view as RecyclerView).countChildViewOccurrences(
+            R.id.repeated_group_instance_header_title,
+          ),
+        )
+        .isEqualTo(1)
+    }
+  }
+
+  @Test
+  fun test_repeated_group_is_deleted() {
+    buildFragmentFromQuestionnaire(
+      "/component_repeated_group.json",
+      responseFileName = "/repeated_group_response.json",
+    )
+
+    onView(withId(R.id.questionnaire_edit_recycler_view))
+      .perform(
+        RecyclerViewActions.actionOnItemAtPosition<ViewHolder>(
+          1,
+          clickChildViewWithId(R.id.repeated_group_instance_header_delete_button),
+        ),
+      )
+
+    onView(ViewMatchers.withId(R.id.questionnaire_edit_recycler_view)).check {
+      view,
+      noViewFoundException,
+      ->
+      if (noViewFoundException != null) {
+        throw noViewFoundException
+      }
+      assertThat(
+          (view as RecyclerView).countChildViewOccurrences(
+            R.id.repeated_group_instance_header_title,
+          ),
+        )
+        .isEqualTo(0)
+    }
+  }
+
+  private fun RecyclerView.countChildViewOccurrences(viewId: Int): Int {
+    var count = 0
+    for (i in 0 until this.adapter!!.itemCount) {
+      val holder = findViewHolderForAdapterPosition(i)
+      if (holder?.itemView?.findViewById<View>(viewId) != null) {
+        count++
+      }
+    }
+    return count
+  }
+
+  private fun clickChildViewWithId(id: Int) =
+    object : ViewAction {
+      override fun getConstraints() = isAssignableFrom(View::class.java)
+
+      override fun getDescription() = "Click on a child view with specified id."
+
+      override fun perform(uiController: UiController?, view: View) {
+        view.findViewById<View>(id)?.performClick()
+      }
+    }
+
   private fun buildFragmentFromQuestionnaire(
     fileName: String,
     isReviewMode: Boolean = false,
+    responseFileName: String? = null,
   ): QuestionnaireFragment {
     val questionnaireJsonString = readFileFromAssets(fileName)
-    val questionnaireFragment =
+    val builder =
       QuestionnaireFragment.builder()
         .setQuestionnaire(questionnaireJsonString)
         .setShowCancelButton(true)
         .showReviewPageBeforeSubmit(isReviewMode)
-        .build()
-    activityScenarioRule.scenario.onActivity { activity ->
-      activity.supportFragmentManager.commitNow {
-        setReorderingAllowed(true)
-        add(R.id.container_holder, questionnaireFragment)
+
+    responseFileName?.let { builder.setQuestionnaireResponse(readFileFromAssets(it)) }
+
+    return builder.build().also { fragment ->
+      activityScenarioRule.scenario.onActivity { activity ->
+        activity.supportFragmentManager.commitNow {
+          setReorderingAllowed(true)
+          add(R.id.container_holder, fragment)
+        }
       }
     }
-    return questionnaireFragment
   }
 
   private fun buildFragmentFromQuestionnaire(
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireAdapterItem.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireAdapterItem.kt
index 66d0a77da7..d67430f6bf 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireAdapterItem.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireAdapterItem.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2022-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,9 +17,21 @@
 package com.google.android.fhir.datacapture
 
 import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
+import org.hl7.fhir.r4.model.QuestionnaireResponse
 
 /** Various types of rows that can be used in a Questionnaire RecyclerView. */
 internal sealed interface QuestionnaireAdapterItem {
   /** A row for a question in a Questionnaire RecyclerView. */
   data class Question(val item: QuestionnaireViewItem) : QuestionnaireAdapterItem
+
+  /** A row for a repeated group response instance's header. */
+  data class RepeatedGroupHeader(
+    /** The response index. This is 0-indexed, but should be 1-indexed when rendered in the UI. */
+    val index: Int,
+    /** Callback that is invoked when the user clicks the delete button. */
+    val onDeleteClicked: () -> Unit,
+    /** Responses nested under this header. */
+    val responses: List<QuestionnaireResponse.QuestionnaireResponseItemComponent>,
+    val title: String,
+  ) : QuestionnaireAdapterItem
 }
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireEditAdapter.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireEditAdapter.kt
index c1df3c0f9f..e7c53ac2b1 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireEditAdapter.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireEditAdapter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 Google LLC
+ * Copyright 2022-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,13 @@
 
 package com.google.android.fhir.datacapture
 
+import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
 import com.google.android.fhir.datacapture.contrib.views.PhoneNumberViewHolderFactory
+import com.google.android.fhir.datacapture.extensions.inflate
 import com.google.android.fhir.datacapture.extensions.itemControl
 import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.android.fhir.datacapture.views.factories.AttachmentViewHolderFactory
@@ -39,6 +42,7 @@ import com.google.android.fhir.datacapture.views.factories.QuantityViewHolderFac
 import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemDialogSelectViewHolderFactory
 import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemViewHolder
 import com.google.android.fhir.datacapture.views.factories.RadioGroupViewHolderFactory
+import com.google.android.fhir.datacapture.views.factories.RepeatedGroupHeaderItemViewHolder
 import com.google.android.fhir.datacapture.views.factories.SliderViewHolderFactory
 import org.hl7.fhir.r4.model.Questionnaire.QuestionnaireItemType
 
@@ -46,16 +50,25 @@ internal class QuestionnaireEditAdapter(
   private val questionnaireItemViewHolderMatchers:
     List<QuestionnaireFragment.QuestionnaireItemViewHolderFactoryMatcher> =
     emptyList(),
-) : ListAdapter<QuestionnaireAdapterItem, QuestionnaireItemViewHolder>(DiffCallbacks.ITEMS) {
+) :
+  ListAdapter<QuestionnaireAdapterItem, QuestionnaireEditAdapter.ViewHolder>(DiffCallbacks.ITEMS) {
   /**
    * @param viewType the integer value of the [QuestionnaireViewHolderType] used to render the
    *   [QuestionnaireViewItem].
    */
-  override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QuestionnaireItemViewHolder {
+  override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
     val typedViewType = ViewType.parse(viewType)
     val subtype = typedViewType.subtype
     return when (typedViewType.type) {
-      ViewType.Type.QUESTION -> onCreateViewHolderQuestion(parent = parent, subtype = subtype)
+      ViewType.Type.QUESTION ->
+        ViewHolder.QuestionHolder(onCreateViewHolderQuestion(parent = parent, subtype = subtype))
+      ViewType.Type.REPEATED_GROUP_HEADER -> {
+        ViewHolder.RepeatedGroupHeaderHolder(
+          RepeatedGroupHeaderItemViewHolder(
+            parent.inflate(R.layout.repeated_group_instance_header_view),
+          ),
+        )
+      }
     }
   }
 
@@ -99,10 +112,15 @@ internal class QuestionnaireEditAdapter(
     return viewHolderFactory.create(parent)
   }
 
-  override fun onBindViewHolder(holder: QuestionnaireItemViewHolder, position: Int) {
+  override fun onBindViewHolder(holder: ViewHolder, position: Int) {
     when (val item = getItem(position)) {
       is QuestionnaireAdapterItem.Question -> {
-        holder.bind(item.item)
+        holder as ViewHolder.QuestionHolder
+        holder.holder.bind(item.item)
+      }
+      is QuestionnaireAdapterItem.RepeatedGroupHeader -> {
+        holder as ViewHolder.RepeatedGroupHeaderHolder
+        holder.viewHolder.bind(item)
       }
     }
   }
@@ -120,6 +138,11 @@ internal class QuestionnaireEditAdapter(
         type = ViewType.Type.QUESTION
         subtype = getItemViewTypeForQuestion(item.item)
       }
+      is QuestionnaireAdapterItem.RepeatedGroupHeader -> {
+        type = ViewType.Type.REPEATED_GROUP_HEADER
+        // All of the repeated group headers will be rendered identically
+        subtype = 0
+      }
     }
     return ViewType.from(type = type, subtype = subtype).viewType
   }
@@ -150,6 +173,7 @@ internal class QuestionnaireEditAdapter(
 
     enum class Type {
       QUESTION,
+      REPEATED_GROUP_HEADER,
     }
   }
 
@@ -240,6 +264,13 @@ internal class QuestionnaireEditAdapter(
       ?: QuestionnaireViewHolderType.EDIT_TEXT_SINGLE_LINE
   }
 
+  internal sealed class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+    class QuestionHolder(val holder: QuestionnaireItemViewHolder) : ViewHolder(holder.itemView)
+
+    class RepeatedGroupHeaderHolder(val viewHolder: RepeatedGroupHeaderItemViewHolder) :
+      ViewHolder(viewHolder.itemView)
+  }
+
   internal companion object {
     // Choice questions are rendered as dialogs if they have at least this many options
     const val MINIMUM_NUMBER_OF_ANSWER_OPTIONS_FOR_DIALOG = 10
@@ -261,6 +292,10 @@ internal object DiffCallbacks {
             newItem is QuestionnaireAdapterItem.Question &&
               QUESTIONS.areItemsTheSame(oldItem, newItem)
           }
+          is QuestionnaireAdapterItem.RepeatedGroupHeader -> {
+            newItem is QuestionnaireAdapterItem.RepeatedGroupHeader &&
+              oldItem.index == newItem.index
+          }
         }
 
       override fun areContentsTheSame(
@@ -272,6 +307,10 @@ internal object DiffCallbacks {
             newItem is QuestionnaireAdapterItem.Question &&
               QUESTIONS.areContentsTheSame(oldItem, newItem)
           }
+          is QuestionnaireAdapterItem.RepeatedGroupHeader -> {
+            newItem is QuestionnaireAdapterItem.RepeatedGroupHeader &&
+              oldItem.responses == newItem.responses
+          }
         }
     }
 
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
index a3c46c9510..475881ae2f 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
@@ -40,6 +40,7 @@ import com.google.android.fhir.datacapture.extensions.isDisplayItem
 import com.google.android.fhir.datacapture.extensions.isHelpCode
 import com.google.android.fhir.datacapture.extensions.isHidden
 import com.google.android.fhir.datacapture.extensions.isPaginated
+import com.google.android.fhir.datacapture.extensions.isRepeatedGroup
 import com.google.android.fhir.datacapture.extensions.localizedTextSpanned
 import com.google.android.fhir.datacapture.extensions.maxValue
 import com.google.android.fhir.datacapture.extensions.maxValueCqfCalculatedValueExpression
@@ -153,12 +154,12 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
           }
         // Retain the hierarchy and order of items within the questionnaire as specified in the
         // standard. See https://www.hl7.org/fhir/questionnaireresponse.html#notes.
-        questionnaire.item.forEach {
-          questionnaireResponse.addItem(it.createQuestionnaireResponseItem())
-        }
+        questionnaire.item
+          .filterNot { it.isRepeatedGroup }
+          .forEach { questionnaireResponse.addItem(it.createQuestionnaireResponseItem()) }
       }
     }
-    questionnaireResponse.packRepeatedGroups()
+    questionnaireResponse.packRepeatedGroups(questionnaire)
   }
 
   /**
@@ -767,7 +768,8 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
       val isHelpCard = itemHelpCard != null
       val isHelpCardOpen = openedHelpCardSet.contains(questionnaireResponseItem)
       // Add an item for the question itself
-      add(
+
+      val question =
         QuestionnaireAdapterItem.Question(
           QuestionnaireViewItem(
             questionnaireItem,
@@ -811,8 +813,8 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
             isHelpCardOpen = isHelpCard && isHelpCardOpen,
             helpCardStateChangedCallback = helpCardStateChangedCallback,
           ),
-        ),
-      )
+        )
+      add(question)
 
       // Add nested questions after the parent item. We need to get the questionnaire items and
       // (possibly multiple sets of) matching questionnaire response items and generate the adapter
@@ -829,11 +831,24 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
       // For background, see https://build.fhir.org/questionnaireresponse.html#link.
       buildList {
           // Case 1
-          add(questionnaireResponseItem.item)
+          if (!questionnaireItem.isRepeatedGroup) {
+            add(questionnaireResponseItem.item)
+          }
           // Case 2 and 3
           addAll(questionnaireResponseItem.answer.map { it.item })
         }
-        .forEach { nestedResponseItemList ->
+        .forEachIndexed { index, nestedResponseItemList ->
+          if (questionnaireItem.isRepeatedGroup) {
+            // Case 3
+            add(
+              QuestionnaireAdapterItem.RepeatedGroupHeader(
+                index = index,
+                onDeleteClicked = { viewModelScope.launch { question.item.removeAnswerAt(index) } },
+                responses = nestedResponseItemList,
+                title = question.item.questionText?.toString() ?: "",
+              ),
+            )
+          }
           addAll(
             getQuestionnaireAdapterItems(
               // If nested display item is identified as instructions or flyover, then do not create
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/contrib/views/PhoneNumberViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/contrib/views/PhoneNumberViewHolderFactory.kt
index cb58af847c..638ff2fe14 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/contrib/views/PhoneNumberViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/contrib/views/PhoneNumberViewHolderFactory.kt
@@ -19,6 +19,7 @@ package com.google.android.fhir.datacapture.contrib.views
 import android.text.Editable
 import android.text.InputType
 import com.google.android.fhir.datacapture.R
+import com.google.android.fhir.datacapture.extensions.getValidationErrorMessage
 import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemEditTextViewHolderDelegate
 import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemViewHolderDelegate
@@ -58,10 +59,9 @@ object PhoneNumberViewHolderFactory :
         }
       }
 
-      override fun updateUI(
+      override fun updateInputTextUI(
         questionnaireViewItem: QuestionnaireViewItem,
         textInputEditText: TextInputEditText,
-        textInputLayout: TextInputLayout,
       ) {
         val text =
           questionnaireViewItem.answers.singleOrNull()?.valueStringType?.value?.toString() ?: ""
@@ -69,5 +69,17 @@ object PhoneNumberViewHolderFactory :
           textInputEditText.setText(text)
         }
       }
+
+      override fun updateValidationTextUI(
+        questionnaireViewItem: QuestionnaireViewItem,
+        textInputLayout: TextInputLayout,
+      ) {
+        textInputLayout.error =
+          getValidationErrorMessage(
+            textInputLayout.context,
+            questionnaireViewItem,
+            questionnaireViewItem.validationResult,
+          )
+      }
     }
 }
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
index 34653e7e4a..c7b6b97ba5 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
@@ -839,6 +839,35 @@ internal inline fun <T> List<Questionnaire.QuestionnaireItemComponent>.zipByLink
   }
 }
 
+/**
+ * Returns a list of values built from the elements of `this` and the
+ * `questionnaireResponseItemList` with the same linkId using the provided `transform` function
+ * applied to each pair of questionnaire item and questionnaire response item.
+ *
+ * In case of repeated group item, `questionnaireResponseItemList` will contain
+ * QuestionnaireResponseItemComponent with same linkId. So these items are grouped with linkId and
+ * associated with its questionnaire item linkId.
+ */
+internal inline fun <T> groupByAndZipByLinkId(
+  questionnaireItemList: List<Questionnaire.QuestionnaireItemComponent>,
+  questionnaireResponseItemList: List<QuestionnaireResponse.QuestionnaireResponseItemComponent>,
+  transform:
+    (
+      List<Questionnaire.QuestionnaireItemComponent>,
+      List<QuestionnaireResponse.QuestionnaireResponseItemComponent>,
+    ) -> T,
+): List<T> {
+  val linkIdToQuestionnaireItemListMap = questionnaireItemList.groupBy { it.linkId }
+  val linkIdToQuestionnaireResponseItemListMap = questionnaireResponseItemList.groupBy { it.linkId }
+  return (linkIdToQuestionnaireItemListMap.keys + linkIdToQuestionnaireResponseItemListMap.keys)
+    .map { linkId ->
+      transform(
+        linkIdToQuestionnaireItemListMap[linkId] ?: emptyList(),
+        linkIdToQuestionnaireResponseItemListMap[linkId] ?: emptyList(),
+      )
+    }
+}
+
 /**
  * Whether the corresponding [QuestionnaireResponse.QuestionnaireResponseItemComponent] should have
  * [QuestionnaireResponse.QuestionnaireResponseItemComponent]s nested under
@@ -886,7 +915,9 @@ fun Questionnaire.QuestionnaireItemComponent.createQuestionnaireResponseItem():
         !repeats
     ) {
       this@createQuestionnaireResponseItem.item.forEach {
-        this.addItem(it.createQuestionnaireResponseItem())
+        if (!it.isRepeatedGroup) {
+          this.addItem(it.createQuestionnaireResponseItem())
+        }
       }
     }
   }
@@ -956,6 +987,9 @@ private fun List<Questionnaire.QuestionnaireItemComponent>.flattenInto(
   }
 }
 
+internal val Questionnaire.QuestionnaireItemComponent.isRepeatedGroup: Boolean
+  get() = type == Questionnaire.QuestionnaireItemType.GROUP && repeats
+
 // TODO: Move this elsewhere.
 val Resource.logicalId: String
   get() {
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireResponses.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireResponses.kt
index 69c3d15b61..fa0f4c545d 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireResponses.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireResponses.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 Google LLC
+ * Copyright 2022-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,38 +30,75 @@ val QuestionnaireResponse.allItems: List<QuestionnaireResponse.QuestionnaireResp
  * correctly. This is because they are flattened out and nested directly under the parent in the
  * FHIR data format.
  *
- * More details: https://build.fhir.org/questionnaireresponse.html#link.
+ * More details on the structure of questionnaire responses:
+ * https://build.fhir.org/questionnaireresponse.html#link.
+ *
+ * Specifically, this function will go through the items in the questionnaire response, and if
+ * multiple questionnaire response items exist for the same repeated group (identified by the link
+ * id), they will be converted into answers under the same questionnaire response item so that there
+ * is a 1:1 relationship from questionnaire item for the repeated group to questionnaire response
+ * item for the same repeated group.
  *
  * This function should be called before the questionnaire view model accepts an
  * application-provided questionnaire response.
  *
  * See also [unpackRepeatedGroups].
+ *
+ * @throws IllegalArgumentException if more than one sibling questionnaire items (nested under the
+ *   questionnaire root or the same parent item) share the same id
  */
-internal fun QuestionnaireResponse.packRepeatedGroups() {
-  item = item.packRepeatedGroups()
+internal fun QuestionnaireResponse.packRepeatedGroups(questionnaire: Questionnaire) {
+  item = item.packRepeatedGroups(questionnaire.item)
 }
 
-private fun List<QuestionnaireResponse.QuestionnaireResponseItemComponent>.packRepeatedGroups():
-  List<QuestionnaireResponse.QuestionnaireResponseItemComponent> {
-  forEach { it ->
-    it.item = it.item.packRepeatedGroups()
-    it.answer.forEach { it.item = it.item.packRepeatedGroups() }
-  }
-  val linkIdToPackedResponseItems =
-    groupBy { it.linkId }
-      .mapValues { (linkId, questionnaireResponseItems) ->
-        questionnaireResponseItems.singleOrNull()
-          ?: QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
-            this.linkId = linkId
+private fun List<QuestionnaireResponse.QuestionnaireResponseItemComponent>.packRepeatedGroups(
+  questionnaireItems: List<Questionnaire.QuestionnaireItemComponent>,
+): List<QuestionnaireResponse.QuestionnaireResponseItemComponent> {
+  return groupByAndZipByLinkId(questionnaireItems, this) {
+      questionnaireItems,
+      questionnaireResponseItems,
+      ->
+      if (questionnaireItems.isEmpty()) {
+        // If there's no questionnaire item, simply keep the response items. In other words, do not
+        // delete hanging questionnaire responses automatically. This is useful for validation
+        // workflow to identify invalid responses.
+        return@groupByAndZipByLinkId questionnaireResponseItems
+      }
+
+      val questionnaireItem = questionnaireItems.single()
+
+      questionnaireResponseItems.forEach { it ->
+        if (questionnaireItem.type == Questionnaire.QuestionnaireItemType.GROUP) {
+          if (questionnaireItem.repeats) {
+            it.answer.forEach { it.item = it.item.packRepeatedGroups(questionnaireItem.item) }
+          } else {
+            it.item = it.item.packRepeatedGroups(questionnaireItem.item)
+          }
+        } else {
+          it.answer.forEach { it.item = it.item.packRepeatedGroups(questionnaireItem.item) }
+        }
+      }
+
+      if (
+        questionnaireItem.type == Questionnaire.QuestionnaireItemType.GROUP &&
+          questionnaireItem.repeats
+      ) {
+        listOf(
+          QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
+            this.linkId = questionnaireItem.linkId
             answer =
               questionnaireResponseItems.map {
                 QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
                   item = it.item
                 }
               }
-          }
+          },
+        )
+      } else {
+        questionnaireResponseItems
       }
-  return map { it.linkId }.distinct().map { linkIdToPackedResponseItems[it]!! }
+    }
+    .flatten()
 }
 
 /**
@@ -105,9 +142,7 @@ private fun unpackRepeatedGroups(
   questionnaireResponseItem.answer.forEach {
     it.item = unpackRepeatedGroups(questionnaireItem.item, it.item)
   }
-  return if (
-    questionnaireItem.type == Questionnaire.QuestionnaireItemType.GROUP && questionnaireItem.repeats
-  ) {
+  return if (questionnaireItem.isRepeatedGroup) {
     questionnaireResponseItem.answer.map {
       QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
         linkId = questionnaireItem.linkId
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreViewGroups.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreViewGroups.kt
new file mode 100644
index 0000000000..92ce094e81
--- /dev/null
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreViewGroups.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2022-2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.fhir.datacapture.extensions
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.annotation.LayoutRes
+
+val Context.layoutInflater: LayoutInflater
+  get() = LayoutInflater.from(this)
+
+/** Inflates [layoutRes] and attaches it to [this]. */
+fun ViewGroup.include(@LayoutRes layoutRes: Int) {
+  context.layoutInflater.inflate(layoutRes, this, true)
+}
+
+/** Inflates [layoutRes] and returns it without attaching it to [this]. */
+fun ViewGroup.inflate(@LayoutRes layoutRes: Int): View =
+  context.layoutInflater.inflate(layoutRes, this, false)
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/validation/QuestionnaireResponseValidator.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/validation/QuestionnaireResponseValidator.kt
index fce6d84d0e..616549caf7 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/validation/QuestionnaireResponseValidator.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/validation/QuestionnaireResponseValidator.kt
@@ -233,7 +233,7 @@ object QuestionnaireResponseValidator {
     }
     checkQuestionnaireResponseItems(
       questionnaire.item,
-      questionnaireResponse.copy().apply { packRepeatedGroups() }.item,
+      questionnaireResponse.copy().apply { packRepeatedGroups(questionnaire) }.item,
     )
   }
 
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireViewItem.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireViewItem.kt
index cd75191115..ea59151e5d 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireViewItem.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireViewItem.kt
@@ -167,6 +167,21 @@ data class QuestionnaireViewItem(
     )
   }
 
+  internal suspend fun removeAnswerAt(index: Int) {
+    check(questionnaireItem.repeats) {
+      "Questionnaire item with linkId ${questionnaireItem.linkId} does not allow repeated answers"
+    }
+    require(index in answers.indices) {
+      "removeAnswerAt($index), but ${questionnaireItem.linkId} only has ${answers.size} answers"
+    }
+    answersChangedCallback(
+      questionnaireItem,
+      questionnaireResponseItem,
+      answers.filterIndexed { currentIndex, _ -> currentIndex != index },
+      null,
+    )
+  }
+
   /**
    * Updates the draft answer stored in `QuestionnaireViewModel`. This clears any actual answer for
    * the question.
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextDecimalViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextDecimalViewHolderFactory.kt
index 58bde90873..7f0ef4a7d8 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextDecimalViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextDecimalViewHolderFactory.kt
@@ -19,6 +19,7 @@ package com.google.android.fhir.datacapture.views.factories
 import android.text.Editable
 import android.text.InputType
 import com.google.android.fhir.datacapture.R
+import com.google.android.fhir.datacapture.extensions.getValidationErrorMessage
 import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
@@ -43,10 +44,9 @@ internal object EditTextDecimalViewHolderFactory :
           ?: questionnaireViewItem.setDraftAnswer(editable.toString())
       }
 
-      override fun updateUI(
+      override fun updateInputTextUI(
         questionnaireViewItem: QuestionnaireViewItem,
         textInputEditText: TextInputEditText,
-        textInputLayout: TextInputLayout,
       ) {
         val questionnaireItemViewItemDecimalAnswer =
           questionnaireViewItem.answers.singleOrNull()?.valueDecimalType?.value?.toString()
@@ -62,10 +62,22 @@ internal object EditTextDecimalViewHolderFactory :
         } else if (draftAnswer != null && draftAnswer != textInputEditText.text.toString()) {
           textInputEditText.setText(draftAnswer)
         }
+      }
+
+      override fun updateValidationTextUI(
+        questionnaireViewItem: QuestionnaireViewItem,
+        textInputLayout: TextInputLayout,
+      ) {
+        textInputLayout.error =
+          getValidationErrorMessage(
+            textInputLayout.context,
+            questionnaireViewItem,
+            questionnaireViewItem.validationResult,
+          )
         // Update error message if draft answer present
-        if (draftAnswer != null) {
+        if (questionnaireViewItem.draftAnswer != null) {
           textInputLayout.error =
-            textInputEditText.context.getString(R.string.decimal_format_validation_error_msg)
+            textInputLayout.context.getString(R.string.decimal_format_validation_error_msg)
         }
       }
     }
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextIntegerViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextIntegerViewHolderFactory.kt
index dd0affd92e..f619802494 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextIntegerViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextIntegerViewHolderFactory.kt
@@ -23,6 +23,7 @@ import android.text.Editable
 import android.text.InputType
 import androidx.annotation.RequiresApi
 import com.google.android.fhir.datacapture.R
+import com.google.android.fhir.datacapture.extensions.getValidationErrorMessage
 import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
@@ -58,10 +59,9 @@ internal object EditTextIntegerViewHolderFactory :
         }
       }
 
-      override fun updateUI(
+      override fun updateInputTextUI(
         questionnaireViewItem: QuestionnaireViewItem,
         textInputEditText: TextInputEditText,
-        textInputLayout: TextInputLayout,
       ) {
         val answer =
           questionnaireViewItem.answers.singleOrNull()?.valueIntegerType?.value?.toString()
@@ -78,11 +78,22 @@ internal object EditTextIntegerViewHolderFactory :
         } else if (draftAnswer != null && draftAnswer != textInputEditText.text.toString()) {
           textInputEditText.setText(draftAnswer)
         }
+      }
 
+      override fun updateValidationTextUI(
+        questionnaireViewItem: QuestionnaireViewItem,
+        textInputLayout: TextInputLayout,
+      ) {
+        textInputLayout.error =
+          getValidationErrorMessage(
+            textInputLayout.context,
+            questionnaireViewItem,
+            questionnaireViewItem.validationResult,
+          )
         // Update error message if draft answer present
-        if (draftAnswer != null) {
+        if (questionnaireViewItem.draftAnswer != null) {
           textInputLayout.error =
-            textInputEditText.context.getString(
+            textInputLayout.context.getString(
               R.string.integer_format_validation_error_msg,
               formatInteger(Int.MIN_VALUE),
               formatInteger(Int.MAX_VALUE),
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextStringViewHolderDelegate.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextStringViewHolderDelegate.kt
index dc6a3eef33..cd9d284ec0 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextStringViewHolderDelegate.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextStringViewHolderDelegate.kt
@@ -18,6 +18,7 @@ package com.google.android.fhir.datacapture.views.factories
 
 import android.text.Editable
 import android.text.InputType
+import com.google.android.fhir.datacapture.extensions.getValidationErrorMessage
 import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
@@ -58,14 +59,26 @@ internal class EditTextStringViewHolderDelegate :
     }
   }
 
-  override fun updateUI(
+  override fun updateInputTextUI(
     questionnaireViewItem: QuestionnaireViewItem,
     textInputEditText: TextInputEditText,
-    textInputLayout: TextInputLayout,
   ) {
     val text = questionnaireViewItem.answers.singleOrNull()?.valueStringType?.value ?: ""
     if ((text != textInputEditText.text.toString())) {
-      textInputEditText.setText(text)
+      textInputEditText.text?.clear()
+      textInputEditText.append(text)
     }
   }
+
+  override fun updateValidationTextUI(
+    questionnaireViewItem: QuestionnaireViewItem,
+    textInputLayout: TextInputLayout,
+  ) {
+    textInputLayout.error =
+      getValidationErrorMessage(
+        textInputLayout.context,
+        questionnaireViewItem,
+        questionnaireViewItem.validationResult,
+      )
+  }
 }
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextViewHolderFactory.kt
index c83487b28c..44fb753521 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextViewHolderFactory.kt
@@ -32,11 +32,9 @@ import androidx.core.widget.doAfterTextChanged
 import androidx.lifecycle.lifecycleScope
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.extensions.getRequiredOrOptionalText
-import com.google.android.fhir.datacapture.extensions.getValidationErrorMessage
 import com.google.android.fhir.datacapture.extensions.localizedFlyoverSpanned
 import com.google.android.fhir.datacapture.extensions.tryUnwrapContext
 import com.google.android.fhir.datacapture.extensions.unit
-import com.google.android.fhir.datacapture.validation.ValidationResult
 import com.google.android.fhir.datacapture.views.HeaderView
 import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.android.material.textfield.TextInputEditText
@@ -55,7 +53,7 @@ abstract class QuestionnaireItemEditTextViewHolderDelegate(private val rawInputT
 
   private lateinit var context: AppCompatActivity
   private lateinit var header: HeaderView
-  protected lateinit var textInputLayout: TextInputLayout
+  private lateinit var textInputLayout: TextInputLayout
   private lateinit var textInputEditText: TextInputEditText
   private var unitTextView: TextView? = null
   private var textWatcher: TextWatcher? = null
@@ -74,7 +72,7 @@ abstract class QuestionnaireItemEditTextViewHolderDelegate(private val rawInputT
     // https://stackoverflow.com/questions/13614101/fatal-crash-focus-search-returned-a-view-that-wasnt-able-to-take-focus/47991577
     textInputEditText.setOnEditorActionListener { view, actionId, _ ->
       if (actionId != EditorInfo.IME_ACTION_NEXT) {
-        false
+        return@setOnEditorActionListener false
       }
       view.focusSearch(FOCUS_DOWN)?.requestFocus(FOCUS_DOWN) ?: false
     }
@@ -99,25 +97,45 @@ abstract class QuestionnaireItemEditTextViewHolderDelegate(private val rawInputT
       hint = questionnaireViewItem.enabledDisplayItems.localizedFlyoverSpanned
       helperText = getRequiredOrOptionalText(questionnaireViewItem, context)
     }
-    displayValidationResult(questionnaireViewItem.validationResult)
 
-    textInputEditText.removeTextChangedListener(textWatcher)
-    updateUI(questionnaireViewItem, textInputEditText, textInputLayout)
-
-    unitTextView?.apply {
-      text = questionnaireViewItem.questionnaireItem.unit?.code
-      visibility = if (text.isNullOrEmpty()) GONE else VISIBLE
-    }
-
-    textWatcher =
-      textInputEditText.doAfterTextChanged { editable: Editable? ->
-        context.lifecycleScope.launch { handleInput(editable!!, questionnaireViewItem) }
+    /**
+     * Ensures that any validation errors or warnings are immediately reflected in the UI whenever
+     * the view is bound to a new or updated item.
+     */
+    updateValidationTextUI(questionnaireViewItem, textInputLayout)
+
+    /**
+     * Updates the EditText *only* if the EditText is not currently focused.
+     *
+     * This is done to avoid disrupting the user's typing experience and prevent conflicts if they
+     * are actively editing the field. Updating the text programmatically is safe in the following
+     * scenarios:
+     * 1. **ViewHolder Reuse:** When the same ViewHolder is being used to display a different
+     *    QuestionnaireViewItem, the EditText needs to be updated with the new item's content.
+     * 2. **Read-Only Items:** When the item is read-only, its value may change dynamically due to
+     *    expressions, and the EditText needs to reflect this updated value.
+     *
+     * The following actions are performed if the EditText is not focused:
+     * - Removes any existing text change listener.
+     * - Updates the input text UI based on the QuestionnaireViewItem.
+     * - Updates the unit text view (if applicable).
+     * - Attaches a new text change listener to handle user input.
+     */
+    if (!textInputEditText.isFocused) {
+      textInputEditText.removeTextChangedListener(textWatcher)
+      updateInputTextUI(questionnaireViewItem, textInputEditText)
+
+      unitTextView?.apply {
+        text = questionnaireViewItem.questionnaireItem.unit?.code
+        visibility = if (text.isNullOrEmpty()) GONE else VISIBLE
       }
-  }
 
-  private fun displayValidationResult(validationResult: ValidationResult) {
-    textInputLayout.error =
-      getValidationErrorMessage(textInputLayout.context, questionnaireViewItem, validationResult)
+      // TextWatcher is set only once for each question item in scenario 1
+      textWatcher =
+        textInputEditText.doAfterTextChanged { editable: Editable? ->
+          context.lifecycleScope.launch { handleInput(editable!!, questionnaireViewItem) }
+        }
+    }
   }
 
   override fun setReadOnly(isReadOnly: Boolean) {
@@ -128,10 +146,15 @@ abstract class QuestionnaireItemEditTextViewHolderDelegate(private val rawInputT
   /** Handles user input from the `editable` and updates the questionnaire. */
   abstract suspend fun handleInput(editable: Editable, questionnaireViewItem: QuestionnaireViewItem)
 
-  /** Handles the UI update. */
-  abstract fun updateUI(
+  /** Handles the update of [textInputEditText].text. */
+  abstract fun updateInputTextUI(
     questionnaireViewItem: QuestionnaireViewItem,
     textInputEditText: TextInputEditText,
+  )
+
+  /** Handles the update of [textInputLayout].error. */
+  abstract fun updateValidationTextUI(
+    questionnaireViewItem: QuestionnaireViewItem,
     textInputLayout: TextInputLayout,
   )
 }
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/GroupViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/GroupViewHolderFactory.kt
index d68c724c60..a65b5a2d1c 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/GroupViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/GroupViewHolderFactory.kt
@@ -52,6 +52,11 @@ internal object GroupViewHolderFactory :
 
       override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
         header.bind(questionnaireViewItem)
+        addItemButton.text =
+          context.getString(
+            R.string.add_repeated_group_item,
+            questionnaireViewItem.questionText ?: "",
+          )
         addItemButton.visibility =
           if (questionnaireViewItem.questionnaireItem.repeats) View.VISIBLE else View.GONE
         addItemButton.setOnClickListener {
@@ -80,7 +85,7 @@ internal object GroupViewHolderFactory :
       }
 
       override fun setReadOnly(isReadOnly: Boolean) {
-        // No user input
+        addItemButton.isEnabled = !isReadOnly
       }
     }
 }
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/QuestionnaireItemViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/QuestionnaireItemViewHolderFactory.kt
index 52290eeef3..debc57b738 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/QuestionnaireItemViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/QuestionnaireItemViewHolderFactory.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 Google LLC
+ * Copyright 2022-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,10 @@ package com.google.android.fhir.datacapture.views.factories
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.TextView
 import androidx.annotation.LayoutRes
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.fhir.datacapture.QuestionnaireAdapterItem
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.views.MediaView
 import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
@@ -50,7 +52,7 @@ abstract class QuestionnaireItemViewHolderFactory(@LayoutRes open val resId: Int
  *
  * This is used by [QuestionnaireItemAdapter] to initialize views and bind items in [RecyclerView].
  */
-open class QuestionnaireItemViewHolder(
+class QuestionnaireItemViewHolder(
   itemView: View,
   private val delegate: QuestionnaireItemViewHolderDelegate,
 ) : RecyclerView.ViewHolder(itemView) {
@@ -62,7 +64,7 @@ open class QuestionnaireItemViewHolder(
     itemMediaView = itemView.findViewById(R.id.item_media)
   }
 
-  open fun bind(questionnaireViewItem: QuestionnaireViewItem) {
+  fun bind(questionnaireViewItem: QuestionnaireViewItem) {
     delegate.questionnaireViewItem = questionnaireViewItem
     delegate.bind(questionnaireViewItem)
     itemMediaView.bind(questionnaireViewItem.questionnaireItem)
@@ -70,6 +72,30 @@ open class QuestionnaireItemViewHolder(
   }
 }
 
+/** The [RecyclerView.ViewHolder] for [QuestionnaireAdapterItem.RepeatedGroupHeader]. */
+internal class RepeatedGroupHeaderItemViewHolder(
+  itemView: View,
+) : RecyclerView.ViewHolder(itemView) {
+
+  private val header: TextView
+  private val delete: View
+
+  init {
+    header = itemView.findViewById(R.id.repeated_group_instance_header_title)
+    delete = itemView.findViewById(R.id.repeated_group_instance_header_delete_button)
+  }
+
+  fun bind(repeatedGroupHeader: QuestionnaireAdapterItem.RepeatedGroupHeader) {
+    header.text =
+      header.context.getString(
+        R.string.repeated_group_title,
+        "${repeatedGroupHeader.index + 1}",
+        repeatedGroupHeader.title,
+      )
+    delete.setOnClickListener { repeatedGroupHeader.onDeleteClicked() }
+  }
+}
+
 /**
  * Delegate for [QuestionnaireItemViewHolder].
  *
diff --git a/datacapture/src/main/res/drawable/add_24px.xml b/datacapture/src/main/res/drawable/add_24px.xml
new file mode 100644
index 0000000000..697ab3fcc0
--- /dev/null
+++ b/datacapture/src/main/res/drawable/add_24px.xml
@@ -0,0 +1,13 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal"
+>
+  <path
+        android:fillColor="@android:color/white"
+        android:pathData="M440,520L200,520L200,440L440,440L440,200L520,200L520,440L760,440L760,520L520,520L520,760L440,760L440,520Z"
+    />
+</vector>
diff --git a/datacapture/src/main/res/drawable/delete_24px.xml b/datacapture/src/main/res/drawable/delete_24px.xml
new file mode 100644
index 0000000000..287ae418fb
--- /dev/null
+++ b/datacapture/src/main/res/drawable/delete_24px.xml
@@ -0,0 +1,13 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal"
+>
+  <path
+        android:fillColor="@android:color/white"
+        android:pathData="M280,520L680,520L680,440L280,440L280,520ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"
+    />
+</vector>
diff --git a/datacapture/src/main/res/layout/group_header_view.xml b/datacapture/src/main/res/layout/group_header_view.xml
index def51fbde1..f8e58a23c0 100644
--- a/datacapture/src/main/res/layout/group_header_view.xml
+++ b/datacapture/src/main/res/layout/group_header_view.xml
@@ -52,11 +52,10 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/add_item"
+        style="?attr/questionnaireAddRepeatedGroupButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:orientation="vertical"
-        android:text="@string/group_header_add_item_button"
     />
 
 </LinearLayout>
diff --git a/datacapture/src/main/res/layout/repeated_group_instance_header_view.xml b/datacapture/src/main/res/layout/repeated_group_instance_header_view.xml
new file mode 100644
index 0000000000..870ce7e710
--- /dev/null
+++ b/datacapture/src/main/res/layout/repeated_group_instance_header_view.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ Copyright 2023 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/item_margin_horizontal"
+    android:layout_marginVertical="@dimen/item_margin_vertical"
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
+>
+    <TextView
+        android:id="@+id/repeated_group_instance_header_title"
+        style="?attr/questionnaireQuestionTextStyle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+    />
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/repeated_group_instance_header_delete_button"
+        style="?attr/questionnaireDeleteRepeatedGroupButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:text="@string/delete"
+    />
+</LinearLayout>
diff --git a/datacapture/src/main/res/values/attrs.xml b/datacapture/src/main/res/values/attrs.xml
index f0b567b8c2..46d076ed59 100644
--- a/datacapture/src/main/res/values/attrs.xml
+++ b/datacapture/src/main/res/values/attrs.xml
@@ -127,6 +127,14 @@
     <!--   Style for edit button. -->
     <attr name="questionnaireEditButtonStyle" format="reference" />
 
+    <!--   Style for Add another repeated group item button. -->
+    <attr name="questionnaireAddRepeatedGroupButtonStyle" format="reference" />
+    <!--   Style for Delete repeated group item button. -->
+    <attr
+        name="questionnaireDeleteRepeatedGroupButtonStyle"
+        format="reference"
+    />
+
     <!--   Style for validation error dialog title text in modal view. -->
     <attr name="questionnaireValidationDialogTitleStyle" format="reference" />
 
diff --git a/datacapture/src/main/res/values/strings.xml b/datacapture/src/main/res/values/strings.xml
index 72b5ccd08b..79fa579348 100644
--- a/datacapture/src/main/res/values/strings.xml
+++ b/datacapture/src/main/res/values/strings.xml
@@ -137,4 +137,6 @@
     <string name="required">Required</string>
     <string name="required_text_and_new_line">Required\n</string>
     <string name="space_asterisk">\u0020\u002a</string>
+    <string name="repeated_group_title">%1$s. %2$s</string>
+    <string name="add_repeated_group_item">Add %1$s</string>
 </resources>
diff --git a/datacapture/src/main/res/values/styles.xml b/datacapture/src/main/res/values/styles.xml
index 59557b9ecd..d78007c0dd 100644
--- a/datacapture/src/main/res/values/styles.xml
+++ b/datacapture/src/main/res/values/styles.xml
@@ -133,6 +133,14 @@
             name="questionnaireEditButtonStyle"
         >@style/Questionnaire.EditButtonStyle
         </item>
+        <item
+            name="questionnaireAddRepeatedGroupButtonStyle"
+        >@style/Questionnaire.AddRepeatedGroupButtonStyle
+        </item>
+        <item
+            name="questionnaireDeleteRepeatedGroupButtonStyle"
+        >@style/Questionnaire.DeleteRepeatedGroupButtonStyle
+        </item>
         <item name="questionnaireDialogButtonStyle">
             @style/Widget.Material3.Button.TextButton.Dialog
         </item>
@@ -385,6 +393,32 @@
         <item name="android:textAllCaps">false</item>
     </style>
 
+  <style
+        name="Questionnaire.AddRepeatedGroupButtonStyle"
+        parent="Widget.Material3.Button.OutlinedButton"
+    >
+    <item name="android:textAllCaps">false</item>
+    <item name="cornerRadius">4dp</item>
+    <item name="icon">@drawable/add_24px</item>
+    <item
+            name="strokeColor"
+        >@color/m3_text_button_foreground_color_selector</item>
+    <item name="android:paddingLeft">@dimen/m3_btn_text_btn_padding_left</item>
+  </style>
+
+  <style
+        name="Questionnaire.DeleteRepeatedGroupButtonStyle"
+        parent="Widget.Material3.Button.OutlinedButton"
+    >
+    <item name="android:textAllCaps">false</item>
+    <item name="android:textColor">@color/mtrl_error</item>
+    <item name="cornerRadius">4dp</item>
+    <item name="icon">@drawable/delete_24px</item>
+    <item name="strokeColor">@color/mtrl_error</item>
+    <item name="android:paddingLeft">@dimen/m3_btn_text_btn_padding_left</item>
+    <item name="iconTint">@color/mtrl_error</item>
+  </style>
+
     <style
         name="Questionnaire.SubmitButtonStyle"
         parent="Widget.Material3.Button"
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireEditAdapterTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireEditAdapterTest.kt
index 8b3b97bec3..6dd1a3e33d 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireEditAdapterTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireEditAdapterTest.kt
@@ -17,6 +17,8 @@
 package com.google.android.fhir.datacapture
 
 import android.os.Build
+import android.widget.FrameLayout
+import androidx.test.core.app.ApplicationProvider
 import com.google.android.fhir.datacapture.extensions.EXTENSION_ITEM_CONTROL_SYSTEM
 import com.google.android.fhir.datacapture.extensions.EXTENSION_ITEM_CONTROL_SYSTEM_ANDROID_FHIR
 import com.google.android.fhir.datacapture.extensions.EXTENSION_ITEM_CONTROL_URL
@@ -24,7 +26,9 @@ import com.google.android.fhir.datacapture.extensions.EXTENSION_ITEM_CONTROL_URL
 import com.google.android.fhir.datacapture.extensions.ItemControlTypes
 import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.NotValidated
+import com.google.android.fhir.datacapture.views.MediaView
 import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
+import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemViewHolder
 import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemViewHolderFactory
 import com.google.common.truth.Truth.assertThat
 import kotlinx.coroutines.test.runTest
@@ -756,13 +760,10 @@ class QuestionnaireEditAdapterTest {
   fun onCreateViewHolder_customViewType_shouldReturnCorrectCustomViewHolder() {
     val viewFactoryMatchers = getQuestionnaireItemViewHolderFactoryMatchers()
     val questionnaireEditAdapter = QuestionnaireEditAdapter(viewFactoryMatchers)
-    assertThat(
-        questionnaireEditAdapter.onCreateViewHolder(
-          mock(),
-          QuestionnaireViewHolderType.values().size,
-        ),
-      )
-      .isEqualTo(viewFactoryMatchers[0].factory.create(mock()))
+    val holder =
+      questionnaireEditAdapter.onCreateViewHolder(mock(), QuestionnaireViewHolderType.values().size)
+    holder as QuestionnaireEditAdapter.ViewHolder.QuestionHolder
+    assertThat(holder.holder).isEqualTo(fakeHolder)
   }
 
   @Test
@@ -803,11 +804,20 @@ class QuestionnaireEditAdapterTest {
     return listOf(
       QuestionnaireFragment.QuestionnaireItemViewHolderFactoryMatcher(
         mock<QuestionnaireItemViewHolderFactory>().apply {
-          whenever(create(any())).thenReturn(mock())
+          whenever(create(any())).thenReturn(fakeHolder)
         },
       ) { questionnaireItem ->
         questionnaireItem.type == Questionnaire.QuestionnaireItemType.DATE
       },
     )
   }
+
+  private val fakeHolder =
+    QuestionnaireItemViewHolder(
+      itemView =
+        FrameLayout(ApplicationProvider.getApplicationContext()).apply {
+          addView(MediaView(context, null).apply { id = R.id.item_media })
+        },
+      delegate = mock(),
+    )
 }
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt
index 6e1974e3a8..4c8def1287 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt
@@ -3705,90 +3705,87 @@ class QuestionnaireViewModelTest {
           "item": [
             {
               "linkId": "12.0",
-              "answer": [
+              "item": [
                 {
+                  "linkId": "12.6",
                   "item": [
                     {
-                      "linkId": "12.6",
+                      "linkId": "12.6.1",
+                      "answer": [
+                        {
+                          "valueCoding": {
+                            "code": "live-birth",
+                            "display": "Live Birth"
+                          }
+                        }
+                      ]
+                    },
+                    {
+                      "linkId": "12.6.3",
                       "item": [
                         {
-                          "linkId": "12.6.1",
+                          "linkId": "12.6.3.1",
                           "answer": [
                             {
                               "valueCoding": {
-                                "code": "live-birth",
-                                "display": "Live Birth"
+                                "code": "male",
+                                "display": "Male"
                               }
                             }
                           ]
-                        },
-                        {
-                          "linkId": "12.6.3",
-                          "item": [
-                            {
-                              "linkId": "12.6.3.1",
-                              "answer": [
-                                {
-                                  "valueCoding": {
-                                    "code": "male",
-                                    "display": "Male"
-                                  }
-                                }
-                              ]
-                            }
-                          ]
-                        },
+                        }
+                      ]
+                    },
+                    {
+                      "linkId": "12.6.4",
+                      "item": [
                         {
-                          "linkId": "12.6.4",
-                          "item": [
-                            {
-                              "linkId": "12.6.4.1"
-                            }
-                          ]
+                          "linkId": "12.6.4.1"
                         }
                       ]
                     }
                   ]
-                },
+                }
+              ]
+            },
+            {            
+              "linkId": "12.0",
+              "item": [
                 {
+                  "linkId": "12.6",
                   "item": [
                     {
-                      "linkId": "12.6",
+                      "linkId": "12.6.1",
+                      "answer": [
+                        {
+                          "valueCoding": {
+                            "code": "still-birth",
+                            "display": "Stillbirth"
+                          }
+                        }
+                      ]
+                    },
+                    {
+                      "linkId": "12.6.3",
+                      "item": [
+                        {
+                          "linkId": "12.6.3.1"
+                        }
+                      ]
+                    },
+                    {
+                      "linkId": "12.6.4",
                       "item": [
                         {
-                          "linkId": "12.6.1",
+                          "linkId": "12.6.4.1",
                           "answer": [
                             {
                               "valueCoding": {
-                                "code": "still-birth",
-                                "display": "Stillbirth"
+                                "code": "FSB",
+                                "display": "FSB"
                               }
                             }
                           ]
-                        },
-                        {
-                          "linkId": "12.6.3",
-                          "item": [
-                            {
-                              "linkId": "12.6.3.1"
-                            }
-                          ]
-                        },
-                        {
-                          "linkId": "12.6.4",
-                          "item": [
-                            {
-                              "linkId": "12.6.4.1",
-                              "answer": [
-                                {
-                                  "valueCoding": {
-                                    "code": "FSB",
-                                    "display": "FSB"
-                                  }
-                                }
-                              ]
-                            }
-                          ]
                         }
                       ]
                     }
@@ -4121,36 +4118,36 @@ class QuestionnaireViewModelTest {
       }
     val viewModel = createQuestionnaireViewModel(questionnaire)
 
-    fun repeatedGroupA() =
+    fun getQuestionnaireAdapterItemListA() =
       viewModel.getQuestionnaireItemViewItemList().single {
-        it.asQuestion().questionnaireItem.linkId == "repeated-group-a"
+        it.asQuestionOrNull()?.questionnaireItem?.linkId == "repeated-group-a"
       }
 
-    fun repeatedGroupB() =
+    fun getQuestionnaireAdapterItemListB() =
       viewModel.getQuestionnaireItemViewItemList().single {
-        it.asQuestion().questionnaireItem.linkId == "repeated-group-b"
+        it.asQuestionOrNull()?.questionnaireItem?.linkId == "repeated-group-b"
       }
     viewModel.runViewModelBlocking {
       // Calling addAnswer out of order should not result in the answers in the response being out
       // of order; all of the answers to repeated-group-a should come before repeated-group-b.
       repeat(times = 2) {
-        repeatedGroupA()
+        getQuestionnaireAdapterItemListA()
           .asQuestion()
           .addAnswer(
             QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
               item =
-                repeatedGroupA()
+                getQuestionnaireAdapterItemListA()
                   .asQuestion()
                   .questionnaireItem
                   .getNestedQuestionnaireResponseItems()
             },
           )
-        repeatedGroupB()
+        getQuestionnaireAdapterItemListB()
           .asQuestion()
           .addAnswer(
             QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
               item =
-                repeatedGroupB()
+                getQuestionnaireAdapterItemListB()
                   .asQuestion()
                   .questionnaireItem
                   .getNestedQuestionnaireResponseItems()
@@ -4160,18 +4157,25 @@ class QuestionnaireViewModelTest {
 
       assertThat(
           viewModel.getQuestionnaireItemViewItemList().map {
-            it.asQuestion().questionnaireItem.linkId
+            when (it) {
+              is QuestionnaireAdapterItem.Question -> it.item.questionnaireItem.linkId
+              is QuestionnaireAdapterItem.RepeatedGroupHeader -> "RepeatedGroupHeader:${it.index}"
+            }
           },
         )
         .containsExactly(
           "repeated-group-a",
+          "RepeatedGroupHeader:0",
           "nested-item-a",
           "another-nested-item-a",
+          "RepeatedGroupHeader:1",
           "nested-item-a",
           "another-nested-item-a",
           "repeated-group-b",
+          "RepeatedGroupHeader:0",
           "nested-item-b",
           "another-nested-item-b",
+          "RepeatedGroupHeader:1",
           "nested-item-b",
           "another-nested-item-b",
         )
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponentsTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponentsTest.kt
index 32c60eec04..43c75f665e 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponentsTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponentsTest.kt
@@ -2478,6 +2478,30 @@ class MoreQuestionnaireItemComponentsTest {
     assertThat(zipList.size).isEqualTo(3)
   }
 
+  @Test
+  fun `test questionnaireItemComponent is repeatedGroup`() {
+    val question =
+      Questionnaire.QuestionnaireItemComponent().apply {
+        linkId = "1"
+        type = Questionnaire.QuestionnaireItemType.GROUP
+        repeats = true
+      }
+
+    assertThat(question.isRepeatedGroup).isTrue()
+  }
+
+  @Test
+  fun `test questionnaireItemComponent is not RepeatedGroup`() {
+    val question =
+      Questionnaire.QuestionnaireItemComponent().apply {
+        linkId = "1"
+        type = Questionnaire.QuestionnaireItemType.GROUP
+        repeats = false
+      }
+
+    assertThat(question.isRepeatedGroup).isFalse()
+  }
+
   private val displayCategoryExtensionWithInstructionsCode =
     Extension().apply {
       url = EXTENSION_DISPLAY_CATEGORY_URL
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireResponsesTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireResponsesTest.kt
index ddafd1717f..165d95fe45 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireResponsesTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireResponsesTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 Google LLC
+ * Copyright 2022-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -75,7 +75,120 @@ class MoreQuestionnaireResponsesTest {
   }
 
   @Test
-  fun `should pack repeated groups`() {
+  fun `should pack repeated groups with no answers`() {
+    val questionnaire =
+      Questionnaire().apply {
+        id = "a-questionnaire"
+        addItem(
+          QuestionnaireItemComponent().apply {
+            linkId = "repeated-group"
+            type = Questionnaire.QuestionnaireItemType.GROUP
+            repeats = true
+            addItem(
+              QuestionnaireItemComponent().apply {
+                linkId = "nested-item"
+                type = Questionnaire.QuestionnaireItemType.BOOLEAN
+              },
+            )
+          },
+        )
+      }
+
+    val questionnaireResponse =
+      QuestionnaireResponse().apply {
+        addItem(
+          QuestionnaireResponseItemComponent().apply { linkId = "repeated-group" },
+        )
+      }
+
+    assertResourceEquals(
+      questionnaireResponse,
+      QuestionnaireResponse().apply { packRepeatedGroups(questionnaire) },
+    )
+  }
+
+  @Test
+  fun `should pack repeated groups with single set of answers`() {
+    val questionnaire =
+      Questionnaire().apply {
+        addItem(
+          QuestionnaireItemComponent().apply {
+            linkId = "repeated-group"
+            type = Questionnaire.QuestionnaireItemType.GROUP
+            repeats = true
+            addItem(
+              QuestionnaireItemComponent().apply {
+                linkId = "nested-question"
+                type = Questionnaire.QuestionnaireItemType.BOOLEAN
+              },
+            )
+          },
+        )
+      }
+
+    val questionnaireResponse =
+      QuestionnaireResponse().apply {
+        addItem(
+          QuestionnaireResponseItemComponent().apply {
+            linkId = "repeated-group"
+            addItem(
+              QuestionnaireResponseItemComponent().apply {
+                linkId = "nested-question"
+                addAnswer(
+                  QuestionnaireResponseItemAnswerComponent().apply { value = BooleanType(true) },
+                )
+              },
+            )
+          },
+        )
+      }
+
+    val packedQuestionnaireResponse =
+      QuestionnaireResponse().apply {
+        addItem(
+          QuestionnaireResponseItemComponent().apply {
+            linkId = "repeated-group"
+            addAnswer(
+              QuestionnaireResponseItemAnswerComponent().apply {
+                addItem(
+                  QuestionnaireResponseItemComponent().apply {
+                    linkId = "nested-question"
+                    addAnswer(
+                      QuestionnaireResponseItemAnswerComponent().apply {
+                        value = BooleanType(true)
+                      },
+                    )
+                  },
+                )
+              },
+            )
+          },
+        )
+      }
+
+    questionnaireResponse.packRepeatedGroups(questionnaire)
+    assertResourceEquals(questionnaireResponse, packedQuestionnaireResponse)
+  }
+
+  @Test
+  fun `should pack repeated groups with multiple sets of answers`() {
+    val questionnaire =
+      Questionnaire().apply {
+        addItem(
+          QuestionnaireItemComponent().apply {
+            linkId = "repeated-group"
+            type = Questionnaire.QuestionnaireItemType.GROUP
+            repeats = true
+            addItem(
+              QuestionnaireItemComponent().apply {
+                linkId = "nested-question"
+                type = Questionnaire.QuestionnaireItemType.BOOLEAN
+              },
+            )
+          },
+        )
+      }
+
     val questionnaireResponse =
       QuestionnaireResponse().apply {
         addItem(
@@ -143,12 +256,40 @@ class MoreQuestionnaireResponsesTest {
         )
       }
 
-    questionnaireResponse.packRepeatedGroups()
+    questionnaireResponse.packRepeatedGroups(questionnaire)
     assertResourceEquals(questionnaireResponse, packedQuestionnaireResponse)
   }
 
   @Test
-  fun `should not modify other items while packing repeated groups`() {
+  fun `should not modify non-repeated groups while packing repeated groups`() {
+    val questionnaire =
+      Questionnaire().apply {
+        addItem(
+          QuestionnaireItemComponent().apply {
+            linkId = "non-repeated-group-1"
+            type = Questionnaire.QuestionnaireItemType.GROUP
+            addItem(
+              QuestionnaireItemComponent().apply {
+                linkId = "nested-question-1"
+                type = Questionnaire.QuestionnaireItemType.BOOLEAN
+              },
+            )
+          },
+        )
+        addItem(
+          QuestionnaireItemComponent().apply {
+            linkId = "non-repeated-group-2"
+            type = Questionnaire.QuestionnaireItemType.GROUP
+            addItem(
+              QuestionnaireItemComponent().apply {
+                linkId = "nested-question-2"
+                type = Questionnaire.QuestionnaireItemType.BOOLEAN
+              },
+            )
+          },
+        )
+      }
+
     val questionnaireResponse =
       QuestionnaireResponse().apply {
         addItem(
@@ -209,7 +350,7 @@ class MoreQuestionnaireResponsesTest {
         )
       }
 
-    questionnaireResponse.packRepeatedGroups()
+    questionnaireResponse.packRepeatedGroups(questionnaire)
     assertResourceEquals(questionnaireResponse, packedQuestionnaireResponse)
   }
 
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireViewItemTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireViewItemTest.kt
index 4beaca8ecc..5b5c678a04 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireViewItemTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireViewItemTest.kt
@@ -163,6 +163,91 @@ class QuestionnaireViewItemTest {
     assertThat(answers).hasSize(1)
   }
 
+  @Test
+  fun `remove answer at given index`() = runTest {
+    val questionnaireItem =
+      Questionnaire.QuestionnaireItemComponent().apply {
+        linkId = "group-1"
+        type = Questionnaire.QuestionnaireItemType.GROUP
+        repeats = true
+        item =
+          listOf(
+            Questionnaire.QuestionnaireItemComponent().apply {
+              linkId = "nested-item-1"
+              type = Questionnaire.QuestionnaireItemType.STRING
+            },
+          )
+      }
+
+    val responseItem1 =
+      QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
+        linkId = "1"
+        answer =
+          listOf(
+            QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
+              value = StringType("Answer 1")
+            },
+          )
+      }
+
+    val responseItem2 =
+      QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
+        linkId = "2"
+        answer =
+          listOf(
+            QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
+              value = StringType("Answer 2")
+            },
+          )
+      }
+
+    val responseItem3 =
+      QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
+        linkId = "3"
+        answer =
+          listOf(
+            QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
+              value = StringType("Answer 3")
+            },
+          )
+      }
+
+    val questionnaireResponseItem =
+      QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
+        linkId = "group-1"
+        answer =
+          listOf(
+            QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
+              item = listOf(responseItem1)
+            },
+            QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
+              item = listOf(responseItem2)
+            },
+            QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
+              item = listOf(responseItem3)
+            },
+          )
+      }
+
+    var updatedAnswers: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent> =
+      listOf()
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
+        questionnaireItem = questionnaireItem,
+        questionnaireResponseItem = questionnaireResponseItem,
+        validationResult = NotValidated,
+        answersChangedCallback = { _, responseItem, result, _ -> updatedAnswers = result },
+      )
+
+    questionnaireViewItem.removeAnswerAt(1)
+
+    assertThat(updatedAnswers.size).isEqualTo(2)
+    assertThat(updatedAnswers.first().item.first().answer.first().valueStringType.value)
+      .isEqualTo("Answer 1")
+    assertThat(updatedAnswers.last().item.first().answer.first().valueStringType.value)
+      .isEqualTo("Answer 3")
+  }
+
   @Test
   fun hasAnswerOption_questionnaireItemRepeats_shouldReturnTrue() {
     val questionnaireViewItem =
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/EditTextViewHolderFactoryTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/EditTextViewHolderFactoryTest.kt
new file mode 100644
index 0000000000..fbfaa8b38f
--- /dev/null
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/EditTextViewHolderFactoryTest.kt
@@ -0,0 +1,174 @@
+/*
+ * Copyright 2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.fhir.datacapture.views.factories
+
+import android.text.Editable
+import android.widget.FrameLayout
+import androidx.appcompat.app.AppCompatActivity
+import com.google.android.fhir.datacapture.extensions.getValidationErrorMessage
+import com.google.android.fhir.datacapture.validation.NotValidated
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
+import com.google.android.material.R
+import com.google.android.material.textfield.TextInputEditText
+import com.google.android.material.textfield.TextInputLayout
+import com.google.common.truth.Truth
+import org.hl7.fhir.r4.model.Questionnaire
+import org.hl7.fhir.r4.model.QuestionnaireResponse
+import org.hl7.fhir.r4.model.QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent
+import org.hl7.fhir.r4.model.StringType
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.Robolectric
+import org.robolectric.RobolectricTestRunner
+
+@RunWith(RobolectricTestRunner::class)
+class EditTextViewHolderFactoryTest {
+
+  private val parent =
+    FrameLayout(
+      Robolectric.buildActivity(AppCompatActivity::class.java).create().get().apply {
+        setTheme(R.style.Theme_Material3_DayNight)
+      },
+    )
+  private val testViewHolder =
+    object :
+        EditTextViewHolderFactory(
+          com.google.android.fhir.datacapture.R.layout.edit_text_single_line_view,
+        ) {
+        override fun getQuestionnaireItemViewHolderDelegate() =
+          object : QuestionnaireItemEditTextViewHolderDelegate(DECIMAL_INPUT_TYPE) {
+
+            private var programmaticUpdateCounter = 0
+
+            override suspend fun handleInput(
+              editable: Editable,
+              questionnaireViewItem: QuestionnaireViewItem,
+            ) {}
+
+            override fun updateInputTextUI(
+              questionnaireViewItem: QuestionnaireViewItem,
+              textInputEditText: TextInputEditText,
+            ) {
+              programmaticUpdateCounter += 1
+              textInputEditText.setText("$programmaticUpdateCounter")
+            }
+
+            override fun updateValidationTextUI(
+              questionnaireViewItem: QuestionnaireViewItem,
+              textInputLayout: TextInputLayout,
+            ) {
+              textInputLayout.error =
+                getValidationErrorMessage(
+                  textInputLayout.context,
+                  questionnaireViewItem,
+                  questionnaireViewItem.validationResult,
+                )
+              // Update error message if draft answer present
+              if (questionnaireViewItem.draftAnswer != null) {
+                textInputLayout.error =
+                  textInputLayout.context.getString(
+                    com.google.android.fhir.datacapture.R.string
+                      .decimal_format_validation_error_msg,
+                  )
+              }
+            }
+          }
+      }
+      .create(parent)
+
+  @Test
+  fun `binding when view is in focus does not programmatically update edit text but updates validation ui`() {
+    testViewHolder.bind(
+      QuestionnaireViewItem(
+        Questionnaire.QuestionnaireItemComponent(),
+        QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
+          answer =
+            listOf(
+              QuestionnaireResponseItemAnswerComponent().apply { value = StringType("1") },
+            )
+        },
+        validationResult = NotValidated,
+        answersChangedCallback = { _, _, _, _ -> },
+      ),
+    )
+
+    testViewHolder.bind(
+      QuestionnaireViewItem(
+        Questionnaire.QuestionnaireItemComponent(),
+        QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
+          answer =
+            listOf(
+              QuestionnaireResponseItemAnswerComponent().apply { value = StringType("1.1") },
+            )
+        },
+        validationResult = NotValidated,
+        answersChangedCallback = { _, _, _, _ -> },
+      ),
+    )
+
+    Truth.assertThat(
+        testViewHolder.itemView
+          .findViewById<TextInputEditText>(
+            com.google.android.fhir.datacapture.R.id.text_input_edit_text,
+          )
+          .text
+          .toString(),
+      )
+      .isEqualTo("2") // Value of [programmaticUpdateCounter] in the [testViewHolder]
+
+    testViewHolder.itemView
+      .findViewById<TextInputEditText>(
+        com.google.android.fhir.datacapture.R.id.text_input_edit_text,
+      )
+      .requestFocus()
+
+    testViewHolder.bind(
+      QuestionnaireViewItem(
+        Questionnaire.QuestionnaireItemComponent(),
+        QuestionnaireResponse.QuestionnaireResponseItemComponent().apply { answer = emptyList() },
+        validationResult = NotValidated,
+        answersChangedCallback = { _, _, _, _ -> },
+        draftAnswer = "1.1.",
+      ),
+    )
+
+    Truth.assertThat(
+        testViewHolder.itemView
+          .findViewById<TextInputEditText>(
+            com.google.android.fhir.datacapture.R.id.text_input_edit_text,
+          )
+          .text
+          .toString(),
+      )
+      .isEqualTo("2") // Since the view is in focus the value will not be updated
+
+    Truth.assertThat(
+        testViewHolder.itemView
+          .findViewById<TextInputLayout>(com.google.android.fhir.datacapture.R.id.text_input_layout)
+          .error
+          .toString(),
+      )
+      .isEqualTo(
+        testViewHolder.itemView
+          .findViewById<TextInputLayout>(com.google.android.fhir.datacapture.R.id.text_input_layout)
+          .context
+          .getString(
+            com.google.android.fhir.datacapture.R.string.decimal_format_validation_error_msg,
+          ),
+      )
+  }
+}
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/GroupViewHolderFactoryTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/GroupViewHolderFactoryTest.kt
index 538536cfee..d66e7768a1 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/GroupViewHolderFactoryTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/GroupViewHolderFactoryTest.kt
@@ -17,6 +17,7 @@
 package com.google.android.fhir.datacapture.views.factories
 
 import android.view.View
+import android.widget.Button
 import android.widget.FrameLayout
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
@@ -196,4 +197,40 @@ class GroupViewHolderFactoryTest {
     assertThat(viewHolder.itemView.findViewById<View>(R.id.add_item).visibility)
       .isEqualTo(View.GONE)
   }
+
+  @Test
+  fun `test repeated group is read only view`() {
+    viewHolder.bind(
+      QuestionnaireViewItem(
+        Questionnaire.QuestionnaireItemComponent().apply {
+          text = "Question?"
+          type = Questionnaire.QuestionnaireItemType.GROUP
+          repeats = true
+          readOnly = true
+        },
+        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
+        validationResult = NotValidated,
+        answersChangedCallback = { _, _, _, _ -> },
+      ),
+    )
+    assertThat((viewHolder.itemView.findViewById<Button>(R.id.add_item).isEnabled)).isFalse()
+  }
+
+  @Test
+  fun `test repeated group is not read only`() {
+    viewHolder.bind(
+      QuestionnaireViewItem(
+        Questionnaire.QuestionnaireItemComponent().apply {
+          text = "Question?"
+          type = Questionnaire.QuestionnaireItemType.GROUP
+          repeats = true
+          readOnly = false
+        },
+        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
+        validationResult = NotValidated,
+        answersChangedCallback = { _, _, _, _ -> },
+      ),
+    )
+    assertThat((viewHolder.itemView.findViewById<Button>(R.id.add_item).isEnabled)).isTrue()
+  }
 }
diff --git a/demo/build.gradle.kts b/demo/build.gradle.kts
index 8c2ee36a28..7cf86019d7 100644
--- a/demo/build.gradle.kts
+++ b/demo/build.gradle.kts
@@ -19,7 +19,7 @@ android {
   }
   buildTypes {
     release {
-      isMinifyEnabled = false
+      isMinifyEnabled = true
       proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
     }
   }
diff --git a/demo/src/main/java/com/google/android/fhir/demo/PatientDetailsViewModel.kt b/demo/src/main/java/com/google/android/fhir/demo/PatientDetailsViewModel.kt
index 14336bba7f..014177a327 100644
--- a/demo/src/main/java/com/google/android/fhir/demo/PatientDetailsViewModel.kt
+++ b/demo/src/main/java/com/google/android/fhir/demo/PatientDetailsViewModel.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2023-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewModelScope
 import com.google.android.fhir.FhirEngine
-import com.google.android.fhir.logicalId
 import com.google.android.fhir.search.revInclude
 import com.google.android.fhir.search.search
 import java.text.SimpleDateFormat
@@ -379,3 +378,12 @@ data class RiskAssessmentItem(
   var lastContacted: String,
   var patientCardColor: Int,
 )
+
+/**
+ * The logical (unqualified) part of the ID. For example, if the ID is
+ * "http://example.com/fhir/Patient/123/_history/456", then this value would be "123".
+ */
+private val Resource.logicalId: String
+  get() {
+    return this.idElement?.idPart.orEmpty()
+  }
diff --git a/docs/use/Snapshots.md b/docs/use/Snapshots.md
new file mode 100644
index 0000000000..583c5694d1
--- /dev/null
+++ b/docs/use/Snapshots.md
@@ -0,0 +1,76 @@
+# Snapshots
+
+You can test the latest Android FHIR SDK libraries using the snapshot versions published on GitHub Packages. 
+
+They are unreleased versions of the library built from the `HEAD` of the main branch and have the `-SNAPSHOT` suffix in their version numbers.
+
+They can be found here: https://github.com/google?tab=packages&repo_name=android-fhir
+
+> :warning: The snapshots are for testing and development purposes only. They are not QA tested and not production ready. Do **NOT** use them in production.
+
+# How to use SNAPSHOT artifacts
+
+## Configure GitHub maven repositories in `build.gradle.kts`
+
+Since these artifacts are deployed on GitHub Packages, a `username`/`GitHub token` pair is required as explained in [Authenticating to GitHub Packages](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-apache-maven-registry#authenticating-to-github-packages). The token needs at least the `read:packages` scope.
+
+This can be securely managed by placing the credentials in the `local.properties` file and loading them with `gradleLocalProperties`. With this approach, the file `build.gradle.kts` will look like:
+
+```kotlin
+import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
+
+plugins {
+  ...
+}
+
+android {
+  ...
+  repositories{
+    maven {
+      url = uri("https://maven.pkg.github.com/google/android-fhir")
+      credentials {
+        username = gradleLocalProperties(rootDir).getProperty("gpr.user") ?: System.getenv("GPR_USER")
+        password = gradleLocalProperties(rootDir).getProperty("gpr.key") ?: System.getenv("GPR_KEY")
+      }
+    }
+  }
+}
+
+dependencies {
+}
+```
+
+Notice the environment variables `GPR_USER`/`GPR_KEY` used in this file.
+
+Then, the file `local.properties` will need to be created in the project root folder:
+
+```dotenv
+sdk.dir=<path to Android SDK>
+gpr.user=<Your GitHub Account>
+gpr.key=<A GitHub token>
+```
+
+## Declare dependencies
+
+To include the snapshots in the dependencies of your app, modify `build.gradle.kts` in your app:
+
+```kotlin
+dependencies {
+  ...
+  implementation("com.google.android.fhir:engine:<engine-version>-SNAPSHOT")
+  implementation("com.google.android.fhir:data-capture:<dc-version>-SNAPSHOT")
+}
+```
+
+The versions `<...-version>` can be found in https://github.com/google?tab=packages&repo_name=android-fhir
+
+## How SNAPSHOT versions are managed by Gradle
+
+The complete documentation can be found in the section [Declaring a changing version](https://docs.gradle.org/current/userguide/dynamic_versions.html#sub:declaring_dependency_with_changing_version).
+
+To summarize:
+- By default, Gradle caches changing versions of dependencies for **24 hours**
+- Dependency caching can be [controlled programmatically](https://docs.gradle.org/current/userguide/dynamic_versions.html#sec:controlling_dependency_caching_programmatically)
+- The `--refresh-dependencies` option in command line tells Gradle to ignore all cached versions
+
+
diff --git a/document/build.gradle.kts b/document/build.gradle.kts
index 6001760384..000bebbfbe 100644
--- a/document/build.gradle.kts
+++ b/document/build.gradle.kts
@@ -52,6 +52,7 @@ dependencies {
   testImplementation(Dependencies.mockitoInline)
   testImplementation(Dependencies.Kotlin.kotlinCoroutinesTest)
   testImplementation(Dependencies.mockWebServer)
+  testImplementation(Dependencies.truth)
 
   androidTestImplementation(Dependencies.AndroidxTest.extJunit)
   androidTestImplementation(Dependencies.Espresso.espressoCore)
diff --git a/document/src/main/java/com.google.android.fhir.document/IPSDocument.kt b/document/src/main/java/com.google.android.fhir.document/IPSDocument.kt
index 2845b23206..78582d08e9 100644
--- a/document/src/main/java/com.google.android.fhir.document/IPSDocument.kt
+++ b/document/src/main/java/com.google.android.fhir.document/IPSDocument.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2023-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,9 @@
 package com.google.android.fhir.document
 
 import org.hl7.fhir.r4.model.Bundle
-import org.hl7.fhir.r4.model.Patient
+import org.hl7.fhir.r4.model.Composition
 import org.hl7.fhir.r4.model.Resource
+import org.hl7.fhir.r4.model.ResourceType
 
 /**
  * Represents an International Patient Summary (IPS) document, associating it with a specific
@@ -31,13 +32,29 @@ import org.hl7.fhir.r4.model.Resource
  *
  * @property document The FHIR Bundle itself, which contains the IPS document
  * @property titles A list of titles of the sections present in the document.
- * @property patient The FHIR Patient resource associated with the IPS document.
  */
 data class IPSDocument(
   val document: Bundle,
   val titles: ArrayList<Title>,
-  val patient: Patient,
-)
+) {
+  companion object {
+    fun create(bundle: Bundle): IPSDocument {
+      if (bundle.entry.isNotEmpty()) {
+        val composition =
+          bundle.entry
+            ?.firstOrNull { it.resource.resourceType == ResourceType.Composition }
+            ?.resource as Composition
+        val titles =
+          composition.section.map {
+            val titleText = it.title ?: "Unknown Section"
+            Title(titleText, ArrayList())
+          } as ArrayList<Title>
+        return IPSDocument(bundle, titles)
+      }
+      return IPSDocument(bundle, titles = arrayListOf())
+    }
+  }
+}
 
 /**
  * Represents a title, which corresponds to a section present in the IPS document.
diff --git a/document/src/main/java/com.google.android.fhir.document/RetrofitSHLService.kt b/document/src/main/java/com.google.android.fhir.document/RetrofitSHLService.kt
index 27449d35b7..e7a45db147 100644
--- a/document/src/main/java/com.google.android.fhir.document/RetrofitSHLService.kt
+++ b/document/src/main/java/com.google.android.fhir.document/RetrofitSHLService.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2023-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,16 +18,17 @@ package com.google.android.fhir.document
 
 import com.google.android.fhir.NetworkConfiguration
 import com.google.android.fhir.sync.remote.GzipUploadInterceptor
-import com.google.android.fhir.sync.remote.HttpLogger
 import java.util.concurrent.TimeUnit
 import okhttp3.OkHttpClient
 import okhttp3.RequestBody
 import okhttp3.ResponseBody
 import okhttp3.logging.HttpLoggingInterceptor
+import org.json.JSONObject
 import retrofit2.Response
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import retrofit2.http.Body
+import retrofit2.http.GET
 import retrofit2.http.Header
 import retrofit2.http.Headers
 import retrofit2.http.POST
@@ -53,16 +54,26 @@ interface RetrofitSHLService {
     @Header("Authorization") authorization: String,
   ): Response<ResponseBody>
 
+  /* POST request to the SHL's manifest url to get the list of files associated with the link */
+  @POST
+  @Headers("Content-Type: application/json")
+  suspend fun getFilesFromManifest(
+    @Url path: String,
+    @Body jsonData: JSONObject,
+  ): Response<ResponseBody>
+
+  /* GET request if files are stored in an external "location" */
+  @GET
+  suspend fun getFromLocation(
+    @Url path: String,
+  ): Response<ResponseBody>
+
   class Builder(
     private val baseUrl: String,
     private val networkConfiguration: NetworkConfiguration,
   ) {
     private var httpLoggingInterceptor: HttpLoggingInterceptor? = null
 
-    fun setHttpLogger(httpLogger: HttpLogger) = apply {
-      httpLoggingInterceptor = httpLogger.toOkHttpLoggingInterceptor()
-    }
-
     fun build(): RetrofitSHLService {
       val client =
         OkHttpClient.Builder()
@@ -83,25 +94,5 @@ interface RetrofitSHLService {
         .build()
         .create(RetrofitSHLService::class.java)
     }
-
-    /* Maybe move these to different class */
-    private fun HttpLogger.toOkHttpLoggingInterceptor() =
-      HttpLoggingInterceptor(log).apply {
-        level = configuration.level.toOkhttpLogLevel()
-        configuration.headersToIgnore?.forEach { this.redactHeader(it) }
-      }
-
-    private fun HttpLogger.Level.toOkhttpLogLevel() =
-      when (this) {
-        HttpLogger.Level.NONE -> HttpLoggingInterceptor.Level.NONE
-        HttpLogger.Level.BASIC -> HttpLoggingInterceptor.Level.BASIC
-        HttpLogger.Level.HEADERS -> HttpLoggingInterceptor.Level.HEADERS
-        HttpLogger.Level.BODY -> HttpLoggingInterceptor.Level.BODY
-      }
-  }
-
-  companion object {
-    fun builder(baseUrl: String, networkConfiguration: NetworkConfiguration) =
-      Builder(baseUrl, networkConfiguration)
   }
 }
diff --git a/document/src/main/java/com.google.android.fhir.document/decode/ReadSHLinkUtils.kt b/document/src/main/java/com.google.android.fhir.document/decode/ReadSHLinkUtils.kt
new file mode 100644
index 0000000000..a2b648467c
--- /dev/null
+++ b/document/src/main/java/com.google.android.fhir.document/decode/ReadSHLinkUtils.kt
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.fhir.document.decode
+
+import android.util.Base64
+import com.nimbusds.jose.JWEDecrypter
+import com.nimbusds.jose.JWEObject
+import com.nimbusds.jose.crypto.DirectDecrypter
+import java.io.ByteArrayOutputStream
+import java.util.zip.DataFormatException
+import java.util.zip.Inflater
+import org.json.JSONObject
+
+object ReadSHLinkUtils {
+
+  /* Extracts the part of the link after the 'shlink:/' */
+  fun extractUrl(scannedData: String): String {
+    if (scannedData.contains("shlink:/")) {
+      return scannedData.substringAfterLast("shlink:/")
+    }
+    throw IllegalArgumentException("Not a valid SHLink")
+  }
+
+  /* Decodes the extracted url from Base64Url to a byte array */
+  fun decodeUrl(extractedUrl: String): ByteArray {
+    if (extractedUrl.isEmpty()) {
+      throw IllegalArgumentException("Not a valid Base64 encoded string")
+    }
+    try {
+      return Base64.decode(extractedUrl.toByteArray(), Base64.URL_SAFE)
+    } catch (err: IllegalArgumentException) {
+      throw IllegalArgumentException("Not a valid Base64 encoded string")
+    }
+  }
+
+  /* Returns a string of data found in the verifiableCredential field in the given JSON */
+  fun extractVerifiableCredential(jsonString: String): String {
+    val jsonObject = JSONObject(jsonString)
+    if (jsonObject.has("verifiableCredential")) {
+      val verifiableCredentialArray = jsonObject.getJSONArray("verifiableCredential")
+
+      if (verifiableCredentialArray.length() > 0) {
+        // Assuming you want the first item from the array
+        return verifiableCredentialArray.getString(0)
+      }
+    }
+    return ""
+  }
+
+  /* Decodes and decompresses the payload in a JWT token */
+  fun decodeAndDecompressPayload(token: String): String {
+    try {
+      val tokenParts = token.split('.')
+      if (tokenParts.size < 2) {
+        throw Error("Invalid JWT token passed in")
+      }
+      val decoded = Base64.decode(tokenParts[1], Base64.URL_SAFE)
+      val inflater = Inflater(true)
+      inflater.setInput(decoded)
+      val initialBufferSize = 100000
+      val decompressedBytes = ByteArrayOutputStream(initialBufferSize)
+      val buffer = ByteArray(8192)
+
+      try {
+        while (!inflater.finished()) {
+          val length = inflater.inflate(buffer)
+          decompressedBytes.write(buffer, 0, length)
+        }
+        decompressedBytes.close()
+      } catch (e: DataFormatException) {
+        throw Error("$e.printStackTrace()")
+      }
+      inflater.end()
+      return decompressedBytes.toByteArray().decodeToString()
+    } catch (err: Error) {
+      throw Error("Invalid JWT token passed in: $err")
+    }
+  }
+
+  /* Decodes and decompresses the embedded health data from a JWE token into a string */
+  fun decodeShc(responseBody: String, key: String): String {
+    try {
+      if (responseBody.isEmpty() or key.isEmpty()) {
+        throw IllegalArgumentException("The provided strings should not be empty")
+      }
+      val jweObject = JWEObject.parse(responseBody)
+      val decodedKey: ByteArray = Base64.decode(key, Base64.URL_SAFE)
+      val decrypter: JWEDecrypter = DirectDecrypter(decodedKey)
+      jweObject.decrypt(decrypter)
+      return jweObject.payload.toString()
+    } catch (err: Exception) {
+      throw Exception("JWE decryption failed: $err")
+    }
+  }
+}
diff --git a/document/src/main/java/com.google.android.fhir.document/decode/SHLinkDecoder.kt b/document/src/main/java/com.google.android.fhir.document/decode/SHLinkDecoder.kt
new file mode 100644
index 0000000000..14fe96dd1e
--- /dev/null
+++ b/document/src/main/java/com.google.android.fhir.document/decode/SHLinkDecoder.kt
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.fhir.document.decode
+
+import com.google.android.fhir.document.IPSDocument
+
+/**
+ * The [SHLinkDecoder] interface defines a contract for decoding Smart Health Links (SHLs) into
+ * [IPSDocument] objects. Implementations of this interface are responsible for decoding and
+ * decompressing SHLs, fetching associated health data from external sources, and creating
+ * IPSDocument instances.
+ *
+ * The process of decoding SHLs is outlined in its documentation
+ * [SHL Documentation](https://docs.smarthealthit.org/smart-health-links/).
+ *
+ * ## Example Decoding Process:
+ * A SHL is formatted as `[optionalViewer]shlink:/[Base64-Encoded Payload]` (e.g.,
+ * `shlink:/eyJsYWJ...`). First, extract the portion of the link after 'shlink:/' and decode this to
+ * give a SHL Payload. SHL Payloads are structured as:
+ * ```
+ * {
+ *   "url": manifest url,
+ *   "key": SHL-specific key,
+ *   "label": "2023-07-12",
+ *   "flag": "LPU",
+ *   "exp": expiration time,
+ *   "v": SHL Protocol Version
+ * }
+ * ```
+ *
+ * The label, flag, exp, and v properties are optional.
+ *
+ * Send a POST request to the manifest URL with a header of "Content-Type":"application/json" and a
+ * body with a "Recipient", a "Passcode" if the "P" flag is present and optionally
+ * "embeddedLengthMax":INT. Example request body:
+ *
+ *  ```
+ *  {
+ *    "recipient" : "example_name",
+ *    "passcode" : "example_passcode"
+ *  }
+ *  ```
+ * ```
+ *
+ * If the POST request is successful, a list of files is returned.
+ * Example response:
+ *
+ * ```
+ *
+ * { "files" :
+ * [ { "contentType": "application/smart-health-card", "location":"https://bucket.cloud.example..." }, { "contentType": "application/smart-health-card", "embedded":"eyJhb..." } ]
+ * }
+ *
+ * ```
+ *
+ * A file can be one of two types:
+ * - Location: If the resource is stored in a location, a single GET request can be made to retrieve the data.
+ * - Embedded: If the file type is embedded, the data is a JWE token which can be decoded with the SHL-specific key.
+ */
+interface SHLinkDecoder {
+
+  /**
+   * Decodes and decompresses a Smart Health Link (SHL) into an [IPSDocument] object.
+   *
+   * @param shLink The full Smart Health Link.
+   * @param recipient The recipient for the manifest request.
+   * @param passcode The passcode for the manifest request (optional, will be null if the P flag is
+   *   not present in the SHL payload).
+   * @return An [IPSDocument] object if decoding is successful, otherwise null.
+   */
+  suspend fun decodeSHLinkToDocument(
+    shLink: String,
+    recipient: String,
+    passcode: String?,
+  ): IPSDocument?
+}
diff --git a/document/src/main/java/com.google.android.fhir.document/decode/SHLinkDecoderImpl.kt b/document/src/main/java/com.google.android.fhir.document/decode/SHLinkDecoderImpl.kt
new file mode 100644
index 0000000000..cdd31d7088
--- /dev/null
+++ b/document/src/main/java/com.google.android.fhir.document/decode/SHLinkDecoderImpl.kt
@@ -0,0 +1,168 @@
+/*
+ * Copyright 2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.fhir.document.decode
+
+import ca.uhn.fhir.context.FhirContext
+import ca.uhn.fhir.context.FhirVersionEnum
+import com.google.android.fhir.document.IPSDocument
+import com.google.android.fhir.document.RetrofitSHLService
+import com.google.android.fhir.document.scan.SHLinkScanData
+import kotlinx.coroutines.coroutineScope
+import org.hl7.fhir.r4.model.Bundle
+import org.json.JSONArray
+import org.json.JSONObject
+
+class SHLinkDecoderImpl(
+  private val readSHLinkUtils: ReadSHLinkUtils,
+  private val retrofitSHLService: RetrofitSHLService,
+) : SHLinkDecoder {
+
+  private val parser = FhirContext.forCached(FhirVersionEnum.R4).newJsonParser()
+
+  /**
+   * Decodes a Smart Health Link (SHL) to an [IPSDocument] object by creating a new [SHLinkScanData]
+   * object and posting the provided JSON data to its manifest URL.
+   *
+   * @param shLink The full Smart Health Link.
+   * @param recipient The recipient for the manifest request.
+   * @param passcode The passcode for the manifest request (optional, will be null if the P flag is
+   *   not present in the SHL payload).
+   * @return An [IPSDocument] object if decoding is successful, otherwise null.
+   */
+  override suspend fun decodeSHLinkToDocument(
+    shLink: String,
+    recipient: String,
+    passcode: String?,
+  ): IPSDocument? {
+    val shLinkScanData = SHLinkScanData.create(shLink)
+    val requestBody =
+      JSONObject().apply {
+        put("recipient", recipient)
+        if (passcode != null) {
+          put("passcode", passcode)
+        }
+      }
+    val bundle = postToServer(requestBody, shLinkScanData)
+    return if (bundle != null) {
+      IPSDocument.create(bundle)
+    } else {
+      null
+    }
+  }
+
+  /**
+   * Posts the JSON data to the Smart Health Link's manifest URL. If successful, the response body,
+   * which will be a list of files, is decoded.
+   *
+   * @param requestBody The JSON data to be posted to the manifest.
+   * @param shLinkScanData The SHLinkScanData object containing information about the SHL.
+   * @return A FHIR Bundle representing the IPS Document.
+   * @throws Error if there's an issue posting to the manifest or decoding the response.
+   */
+  private suspend fun postToServer(
+    requestBody: JSONObject,
+    shLinkScanData: SHLinkScanData,
+  ): Bundle? = coroutineScope {
+    try {
+      val response =
+        retrofitSHLService.getFilesFromManifest(
+          shLinkScanData.manifestUrl.substringAfterLast("shl/"),
+          requestBody,
+        )
+      if (response.isSuccessful) {
+        val responseBody = response.body()?.string()
+        responseBody?.let {
+          return@coroutineScope decodeResponseBody(it, shLinkScanData)
+        }
+      } else {
+        throw (Error("HTTP Error: ${response.code()}"))
+      }
+    } catch (err: Throwable) {
+      throw (Error("Error posting to the manifest: $err"))
+    }
+  }
+
+  /**
+   * Decodes the response body, handling both embedded files and files stored in an external
+   * location.
+   *
+   * @param responseBody The response body from the manifest request.
+   * @param shLinkScanData The SHLinkScanData object containing information about the SHL.
+   * @return A FHIR Bundle representing the IPS Document.
+   * @throws IllegalArgumentException if no data is found at the given location.
+   */
+  private suspend fun decodeResponseBody(
+    responseBody: String,
+    shLinkScanData: SHLinkScanData,
+  ): Bundle {
+    val jsonObject = JSONObject(responseBody)
+    val embeddedArray =
+      jsonObject.getJSONArray("files").let { jsonArray: JSONArray ->
+        (0 until jsonArray.length())
+          .mapNotNull { i ->
+            val fileObject = jsonArray.getJSONObject(i)
+            if (fileObject.has("embedded")) {
+              fileObject.getString("embedded")
+            } else {
+              fileObject.getString("location").let {
+                val responseFromLocation =
+                  retrofitSHLService.getFromLocation("file/${it.substringAfterLast("/")}")
+                val responseBodyFromLocation = responseFromLocation.body()?.string()
+                if (!responseBodyFromLocation.isNullOrBlank()) {
+                  responseBodyFromLocation
+                } else {
+                  throw (IllegalArgumentException("No data found at the given location"))
+                }
+              }
+            }
+          }
+          .toTypedArray()
+      }
+    return decodeEmbeddedArray(embeddedArray, shLinkScanData)
+  }
+
+  /**
+   * Decodes each element in the array and returns the FHIR Bundle stored inside.
+   *
+   * @param embeddedArray An array of encrypted data elements.
+   * @param shLinkScanData The SHLinkScanData object containing information about the SHL.
+   * @return A FHIR Bundle representing the IPS Document.
+   */
+  private fun decodeEmbeddedArray(
+    embeddedArray: Array<String>,
+    shLinkScanData: SHLinkScanData,
+  ): Bundle {
+    var healthData = ""
+    for (element in embeddedArray) {
+      val decodedShc = shLinkScanData.key.let { readSHLinkUtils.decodeShc(element, it) }
+      if (decodedShc != "") {
+        val toDecode = readSHLinkUtils.extractVerifiableCredential(decodedShc)
+        if (toDecode.isEmpty()) {
+          healthData = decodedShc
+          break
+        }
+        val document =
+          JSONObject(readSHLinkUtils.decodeAndDecompressPayload(toDecode))
+            .getJSONObject("vc")
+            .getJSONObject("credentialSubject")
+            .getJSONObject("fhirBundle")
+        return parser.parseResource(document.toString()) as Bundle
+      }
+    }
+    return parser.parseResource(healthData) as Bundle
+  }
+}
diff --git a/document/src/main/java/com.google.android.fhir.document/generate/SHLinkGeneratorImpl.kt b/document/src/main/java/com.google.android.fhir.document/generate/SHLinkGeneratorImpl.kt
index 998ed9e5de..1b60c5223d 100644
--- a/document/src/main/java/com.google.android.fhir.document/generate/SHLinkGeneratorImpl.kt
+++ b/document/src/main/java/com.google.android.fhir.document/generate/SHLinkGeneratorImpl.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2023-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -62,6 +62,7 @@ internal class SHLinkGeneratorImpl(
     val response = apiService.getManifestUrlAndToken("", requestBody)
     return if (response.isSuccessful) {
       val responseBody = response.body()?.string()
+      println("MANIFEST RESPONSE: $responseBody")
       if (!responseBody.isNullOrBlank()) {
         JSONObject(responseBody)
       } else {
diff --git a/document/src/main/java/com.google.android.fhir.document/scan/SHLinkScanData.kt b/document/src/main/java/com.google.android.fhir.document/scan/SHLinkScanData.kt
new file mode 100644
index 0000000000..9b9bd1cdf0
--- /dev/null
+++ b/document/src/main/java/com.google.android.fhir.document/scan/SHLinkScanData.kt
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2023-2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.fhir.document.scan
+
+import com.google.android.fhir.document.IPSDocument
+import com.google.android.fhir.document.decode.ReadSHLinkUtils
+import java.nio.charset.StandardCharsets
+import org.json.JSONException
+import org.json.JSONObject
+import timber.log.Timber
+
+/**
+ * Represents a SHL data structure, which stores information related to SHL content required for the
+ * scanning process.
+ *
+ * SHLs, or Smart Health Links, are a standardized format for securely sharing health-related
+ * information. For official documentation and specifications, see
+ * [SHL Documentation](https://docs.smarthealthit.org/smart-health-links/).
+ *
+ * @property fullLink The full Smart Health Link (could include an optional SHL viewer).
+ * @property encodedShlPayload The Base64Url-encoded SHL payload.
+ * @property manifestUrl The URL to the SHL manifest.
+ * @property key The key for decoding the data.
+ * @property label A label describing the SHL data.
+ * @property flag Flags indicating specific conditions or requirements (e.g., "P" for passcode).
+ * @property expirationTime The expiration time of the SHL data.
+ * @property versionNumber The version number of the SHL data.
+ * @property ipsDoc The IPS document linked to by the SHL.
+ */
+data class SHLinkScanData(
+  val fullLink: String,
+  val encodedShlPayload: String,
+  val manifestUrl: String,
+  val key: String,
+  val label: String,
+  val flag: String,
+  val expirationTime: String,
+  val versionNumber: String,
+  val ipsDoc: IPSDocument?,
+) {
+  companion object {
+    fun create(fullLink: String): SHLinkScanData {
+      val extractedJson = ReadSHLinkUtils.extractUrl(fullLink)
+      val decodedJson = ReadSHLinkUtils.decodeUrl(extractedJson)
+
+      try {
+        val jsonObject = JSONObject(String(decodedJson, StandardCharsets.UTF_8))
+        return SHLinkScanData(
+          fullLink,
+          extractedJson,
+          jsonObject.optString("url", ""),
+          jsonObject.optString("key", ""),
+          jsonObject.optString("label", ""),
+          jsonObject.optString("flag", ""),
+          jsonObject.optString("expirationTime", ""),
+          jsonObject.optString("versionNumber", ""),
+          null,
+        )
+      } catch (exception: JSONException) {
+        Timber.e(exception, "Error creating JSONObject from decodedJson: $decodedJson")
+        throw exception
+      }
+    }
+  }
+}
diff --git a/document/src/test/java/com/google/android/fhir/document/EncryptionUtilsTest.kt b/document/src/test/java/com/google/android/fhir/document/EncryptionUtilsTest.kt
index ff9170931b..0064f218a7 100644
--- a/document/src/test/java/com/google/android/fhir/document/EncryptionUtilsTest.kt
+++ b/document/src/test/java/com/google/android/fhir/document/EncryptionUtilsTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2023-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,8 +26,10 @@ import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
 
 @RunWith(RobolectricTestRunner::class)
+@Config(manifest = Config.NONE)
 class EncryptionUtilsTest {
 
   private val parser = FhirContext.forCached(FhirVersionEnum.R4).newJsonParser()
diff --git a/document/src/test/java/com/google/android/fhir/document/ReadSHLinkUtilsTest.kt b/document/src/test/java/com/google/android/fhir/document/ReadSHLinkUtilsTest.kt
new file mode 100644
index 0000000000..2491180256
--- /dev/null
+++ b/document/src/test/java/com/google/android/fhir/document/ReadSHLinkUtilsTest.kt
@@ -0,0 +1,154 @@
+/*
+ * Copyright 2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.fhir.document
+
+import com.google.android.fhir.document.decode.ReadSHLinkUtils
+import com.google.common.truth.Truth.assertThat
+import org.junit.Assert.assertThrows
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+
+@RunWith(RobolectricTestRunner::class)
+@Config(manifest = Config.NONE)
+class ReadSHLinkUtilsTest {
+  private val readSHLinkUtils = ReadSHLinkUtils
+
+  private val responseBody =
+    "eyJlbmMiOiJBMjU2R0NNIiwiYWxnIjoiZGlyIn0..OgGwTWbECJk9tQc4.PUxr0STCtKQ6DmdPqPtJtTowTBxdprFykeZ2WUOUw234_TtdGWLJ0hzfuWjZXDyBpa55TXwvSwobpcbut9Cdl2nATA0_j1nW0-A32uAwH0qEE1ELV5G0IQVT5AqKJRTCMGpy0mWH.qATmrk-UdwCOaT1TY6GEJg"
+  private val key = "VmFndWVseS1FbmdhZ2luZy1QYXJhZG94LTA1NTktMDg"
+
+  @Test
+  fun `test extractUrl with a valid SHL`() {
+    val scannedData = "shlink:/example-url"
+    val result = readSHLinkUtils.extractUrl(scannedData)
+    assertThat(result).isEqualTo("example-url")
+  }
+
+  @Test
+  fun `test extractUrl with an invalid SHL`() {
+    val scannedData = "invalidSHL"
+    val result =
+      assertThrows(IllegalArgumentException::class.java) { readSHLinkUtils.extractUrl(scannedData) }
+    assertThat(result.message).isEqualTo("Not a valid SHLink")
+  }
+
+  @Test
+  fun `test extractUrl with an empty SHL`() {
+    val scannedData = ""
+    val result =
+      assertThrows(IllegalArgumentException::class.java) { readSHLinkUtils.extractUrl(scannedData) }
+    assertThat(result.message).isEqualTo("Not a valid SHLink")
+  }
+
+  @Test
+  fun `test that decodeUrl successfully decodes a Base64 encoded input string`() {
+    val extractedUrl = "aGVsbG8="
+    val result = readSHLinkUtils.decodeUrl(extractedUrl)
+    assertThat(result).isEqualTo("hello".toByteArray())
+  }
+
+  @Test
+  fun `test that decodeUrl throws an error when decoding an invalid Base64 encoded input string`() {
+    val extractedUrl = "aGsbG8="
+    val result =
+      assertThrows(IllegalArgumentException::class.java) { readSHLinkUtils.decodeUrl(extractedUrl) }
+    assertThat(result.message).isEqualTo("Not a valid Base64 encoded string")
+  }
+
+  @Test
+  fun `test that decodeUrl throws an error when decoding an empty input string`() {
+    val extractedUrl = ""
+    val result =
+      assertThrows(IllegalArgumentException::class.java) { readSHLinkUtils.decodeUrl(extractedUrl) }
+    assertThat(result.message).isEqualTo("Not a valid Base64 encoded string")
+  }
+
+  @Test
+  fun `test that decodeShc can successfully decrypt an SHL with it's given key`() {
+    val result = readSHLinkUtils.decodeShc(responseBody, key)
+    assertThat(result.trim())
+      .isEqualTo(
+        "{\"iss\":\"DinoChiesa.github.io\",\"sub\":\"idris\",\"aud\":\"kina\",\"iat\":1691158997,\"exp\":1691159597,\"aaa\":true}",
+      )
+  }
+
+  @Test
+  fun `test that decodeShc unsuccessfully decrypts an empty string`() {
+    val responseBody = ""
+    val result =
+      assertThrows(Exception::class.java) { readSHLinkUtils.decodeShc(responseBody, key) }
+    assertThat(result.message).contains("JWE decryption failed")
+  }
+
+  @Test
+  fun `test that decodeShc unsuccessfully decrypts an SHL with an empty key`() {
+    val key = ""
+    val result =
+      assertThrows(Exception::class.java) { readSHLinkUtils.decodeShc(responseBody, key) }
+    assertThat(result.message).contains("JWE decryption failed")
+  }
+
+  @Test
+  fun `test that decodeShc unsuccessfully decrypts an SHL with an invalid key`() {
+    val invalidKey = "VmFndWVseS1FbmdhZ2luZy1QYXJhZG94LTA1NTktMDb"
+    val result =
+      assertThrows(Exception::class.java) { readSHLinkUtils.decodeShc(responseBody, invalidKey) }
+    assertThat(result.message).contains("JWE decryption failed")
+  }
+
+  @Test
+  fun `test extractVerifiableCredential successfully extracts the data from a JSON string`() {
+    val jsonStringWithCredential = "{\"verifiableCredential\": [\"credentialData\"]}"
+    val resultWithCredential = readSHLinkUtils.extractVerifiableCredential(jsonStringWithCredential)
+    assertThat(resultWithCredential).isEqualTo("credentialData")
+  }
+
+  @Test
+  fun `test extractVerifiableCredential successfully extracts the data from an empty JSON string`() {
+    val jsonStringWithoutCredential = "{}"
+    val resultWithoutCredential =
+      readSHLinkUtils.extractVerifiableCredential(jsonStringWithoutCredential)
+    assertThat(resultWithoutCredential).isEqualTo("")
+  }
+
+  @Test
+  fun `test that JWTs can be decoded and decompressed into JSON data`() {
+    val jwt =
+      "eyJ6aXAiOiJERUYiLCJhbGciOiJFUzI1NiIsImtpZCI6IjNLZmRnLVh3UC03Z1h5eXd0VWZVQUR3QnVtRE9QS01ReC1pRUxMMTFXOXMifQ.pZJJT8MwEIX_ChquaZZSthyBAxwQSCwX1IPrTBsjL9HYKRSU_85MaAVCiAtSDnH85vN7z3kHEyPU0KbUxbooYoc6j05RalHZ1OZaURMLfFWusxgLVvdIkIFfLKGujman5bQ8mM7y6dFhBmsN9TukTYdQP30xf-L2PxcTWTDq_zrjXO_Nm0omeJhnoAkb9Mkoe9cvnlEnsbVsDT0iRdHUMMvLvGKofD3rfWNRNIQx9KTxfowA241sGwl0sJZpQsiAD6AN52Ryb-0DWRbs5uuSBbvFL-Bbtsrz0qNy-AlRztiNHErhRfgrs0YvPd5YfiOYD5xsYTj6hUoCmZbV8aSsJuUMhiH71Ub1t42r771lEJNKfRxzym0nlNbXSmvj8Tw0I0GHxvjV6DhuYkK3_Xn4Xlp7nAdaFVJpEU1T6PUrA_Q4CeUJDPMhg24bfXSzREIv1r43x6KgdU_jlmS9N-5HXsYgLQM57kWsKJ0CCbIxsbNKarxGMglp7zLEziRluaP5-AzDBw.xOwN6qSTeHU-FkqTIojbvryr8Ztue_HBbiiGdIcfio7m2-STuC-CdNIEt9WbxU_CpveZwdwdYlaQ3cX-yi-SQg"
+    val expectedData =
+      "{\"iss\":\"https://spec.smarthealth.cards/examples/issuer\",\"nbf\":1649020324.265,\"vc\":{\"type\":[\"https://smarthealth.cards#health-card\",\"https://smarthealth.cards#health-card\",\"https://smarthealth.cards#immunization\"],\"credentialSubject\":{\"fhirVersion\":\"4.0.1\",\"fhirBundle\":{\"resourceType\":\"Bundle\",\"type\":\"collection\",\"entry\":[{\"fullUrl\":\"resource:0\",\"resource\":{\"resourceType\":\"Patient\",\"name\":[{\"family\":\"Brown\",\"given\":[\"Oliver\"]}],\"birthDate\":\"2017-01-04\"}},{\"fullUrl\":\"resource:1\",\"resource\":{\"resourceType\":\"Immunization\",\"status\":\"completed\",\"vaccineCode\":{\"coding\":[{\"system\":\"http://hl7.org/fhir/sid/cvx\",\"code\":\"08\"}]},\"patient\":{\"reference\":\"resource:0\"},\"occurrenceDateTime\":\"2017-01-04\",\"performer\":[{\"actor\":{\"display\":\"Meriter Hospital\"}}]}}]}}}}\n"
+    val decoded = readSHLinkUtils.decodeAndDecompressPayload(jwt)
+    assertThat(expectedData.trim()).isEqualTo(decoded.trim())
+  }
+
+  @Test
+  fun `test that empty JWTs throw an error when attempting to decode and decompress them`() {
+    val jwt = ""
+    val result = assertThrows(Error::class.java) { readSHLinkUtils.decodeAndDecompressPayload(jwt) }
+    assertThat(result.message).contains("Invalid JWT token passed in:")
+  }
+
+  @Test
+  fun `test that invalid JWTs throw an error when attempting to decode and decompress them`() {
+    val jwt =
+      "XAiOiJERUYiLCJhbGciOiJFUzI1NiIsImtpZCI6IjNLZmRnLVh3UC03Z1h5eXd0VWZVQUR3QnVtRE9QS01ReC1pRUxMMTFXOXMifQ.pHJJT8MwEIX_ChquaZZSthyBAxwQSCwX1IPrTBsjL9HYKRSU_85MaAVCiAtSDnH85vN7z3kHEyPU0KbUxbooYoc6j05RalHZ1OZaURMLfFWusxgLVvdIkIFfLKGujman5bQ8mM7y6dFhBmsN9TukTYdQP30xf-L2PxcTWTDq_zrjXO_Nm0omeJhnoAkb9Mkoe9cvnlEnsbVsDT0iRdHUMMvLvGKofD3rfWNRNIQx9KTxfowA241sGwl0sJZpQsiAD6AN52Ryb-0DWRbs5uuSBbvFL-Bbtsrz0qNy-AlRztiNHErhRfgrs0YvPd5YfiOYD5xsYTj6hUoCmZbV8aSsJuUMhiH71Ub1t42r771lEJNKfRxzym0nlNbXSmvj8Tw0I0GHxvjV6DhuYkK3_Xn4Xlp7nAdaFVJpEU1T6PUrA_Q4CeUJDPMhg24bfXSzREIv1r43x6KgdU_jlmS9N-5HXsYgLQM57kWsKJ0CCbIxsbNKarxGMglp7zLEziRluaP5-AzDBw.xOwN6qSTeHU-FkqTIojbvryr8Ztue_HBbiiGdIcfio7m2-STuC-CdNIEt9WbxU_CpveZwdwdYlaQ3cX-yi-SQg"
+    val result = assertThrows(Error::class.java) { readSHLinkUtils.decodeAndDecompressPayload(jwt) }
+    assertThat(result.message).contains("Invalid JWT token passed in:")
+  }
+}
diff --git a/document/src/test/java/com/google/android/fhir/document/SHLinkDecoderImplTest.kt b/document/src/test/java/com/google/android/fhir/document/SHLinkDecoderImplTest.kt
new file mode 100644
index 0000000000..f001d1cca7
--- /dev/null
+++ b/document/src/test/java/com/google/android/fhir/document/SHLinkDecoderImplTest.kt
@@ -0,0 +1,274 @@
+/*
+ * Copyright 2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.fhir.document
+
+import com.google.android.fhir.NetworkConfiguration
+import com.google.android.fhir.document.decode.ReadSHLinkUtils
+import com.google.android.fhir.document.decode.SHLinkDecoderImpl
+import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.runBlocking
+import okhttp3.mockwebserver.MockResponse
+import okhttp3.mockwebserver.MockWebServer
+import okhttp3.mockwebserver.RecordedRequest
+import org.json.JSONArray
+import org.json.JSONObject
+import org.junit.After
+import org.junit.Assert.assertThrows
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.anyString
+import org.mockito.Mockito.`when`
+import org.mockito.MockitoAnnotations
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+
+@RunWith(RobolectricTestRunner::class)
+@Config(manifest = Config.NONE)
+class SHLinkDecoderImplTest {
+
+  private lateinit var shLinkDecoderImpl: SHLinkDecoderImpl
+
+  @Mock private lateinit var readSHLinkUtils: ReadSHLinkUtils
+
+  private val mockWebServer = MockWebServer()
+  private val baseUrl = "/shl/"
+
+  private val shlRetrofitService by lazy {
+    RetrofitSHLService.Builder(mockWebServer.url(baseUrl).toString(), NetworkConfiguration())
+      .build()
+  }
+
+  private val manifestFileResponseWithEmbedded =
+    JSONObject().apply {
+      val filesArray =
+        JSONArray().apply {
+          val fileObject = JSONObject().apply { put("embedded", "embeddedData") }
+          put(fileObject)
+        }
+      put("files", filesArray)
+    }
+
+  private val manifestFileResponseWithLocation =
+    JSONObject().apply {
+      val filesArray =
+        JSONArray().apply {
+          val fileObject = JSONObject().apply { put("location", "locationData") }
+          put(fileObject)
+        }
+      put("files", filesArray)
+    }
+
+  private val getLocationResponse = "locationData"
+  private val exampleSHL =
+    "shlink:/eyJsYWJlbCI6IkN1c3RvbSBEYXRhc2V0IDExIiwidXJsIjoiaHR0cHM6Ly9hcGkudmF4eC5saW5rL2FwaS9zaGwveFJ4M2Q0QzNROE0wbnhaejZmc1ZYdGYyLW5QTDlwUXdBb2RRZVVYNzFqYyIsImZsYWciOiIiLCJrZXkiOiI0RXNvSFF3WXdTLU8wVW43WkNBQXlSMnQ2TVJ3WjJpSndLM0hhY2hpbmcifQ=="
+  private val filesWithEmbedded =
+    "{\"files\": [{\"contentType\": \"application/smart-health-card\", \"embedded\": \"embeddedData\"}]}"
+  private val filesWithLocation =
+    "{\"files\": [{\"contentType\": \"application/smart-health-card\", \"location\": \"https://api.vaxx.link/api/shl/xRx3d4C3Q8M0nxZz6fsVXtf2-nPL9pQwAodQeUX71jc/file/EGxABJF-Co4oplPtLN87HpSlydj9K_BhCip1sGUvevY?ticket=...\"}]}"
+  private val testBundleString =
+    """
+    {
+      "resourceType": "Bundle",
+      "id": "bundle-example"
+    }
+    """
+      .trimIndent()
+
+  @Before
+  fun setUp() {
+    MockitoAnnotations.openMocks(this)
+    shLinkDecoderImpl = SHLinkDecoderImpl(readSHLinkUtils, shlRetrofitService)
+  }
+
+  @After
+  fun tearDown() {
+    mockWebServer.shutdown()
+  }
+
+  @Test
+  fun `test decodeSHLinkToDocument with embedded data and no verifiable content`() = runBlocking {
+    val mockResponse = MockResponse().setResponseCode(200).setBody(filesWithEmbedded)
+    mockWebServer.enqueue(mockResponse)
+
+    `when`(readSHLinkUtils.extractUrl("fullLink")).thenReturn("extractedJson")
+    `when`(readSHLinkUtils.decodeUrl("extractedJson")).thenReturn("{}".toByteArray())
+    `when`(readSHLinkUtils.decodeShc(anyString(), anyString())).thenReturn(testBundleString)
+    `when`(readSHLinkUtils.extractVerifiableCredential(testBundleString)).thenReturn("")
+
+    val result =
+      shLinkDecoderImpl.decodeSHLinkToDocument(
+        exampleSHL,
+        "",
+        "",
+      )
+
+    assertThat(result?.document?.id).isEqualTo("Bundle/bundle-example")
+  }
+
+  @Test
+  fun `test decodeSHLinkToDocument with externally stored data and no verifiable content`() =
+    runBlocking {
+      val mockResponse = MockResponse().setResponseCode(200).setBody(filesWithLocation)
+      mockWebServer.enqueue(mockResponse)
+
+      val mockGetLocationResponse = MockResponse().setResponseCode(200).setBody(getLocationResponse)
+      mockWebServer.enqueue(mockGetLocationResponse)
+
+      `when`(readSHLinkUtils.extractUrl("fullLink")).thenReturn("extractedJson")
+      `when`(readSHLinkUtils.decodeUrl("extractedJson")).thenReturn("{}".toByteArray())
+      `when`(readSHLinkUtils.decodeShc(anyString(), anyString())).thenReturn(testBundleString)
+      `when`(readSHLinkUtils.extractVerifiableCredential(testBundleString)).thenReturn("")
+
+      val result =
+        shLinkDecoderImpl.decodeSHLinkToDocument(
+          exampleSHL,
+          "",
+          "",
+        )
+
+      assertThat(result!!.document).isNotNull()
+
+      val recordedRequestGetManifest: RecordedRequest = mockWebServer.takeRequest()
+      assertThat(recordedRequestGetManifest.path)
+        .isEqualTo("/shl/xRx3d4C3Q8M0nxZz6fsVXtf2-nPL9pQwAodQeUX71jc")
+
+      val recordedRequestGetLocation: RecordedRequest = mockWebServer.takeRequest()
+      assertThat(
+          recordedRequestGetLocation.path!!,
+        )
+        .contains(
+          "/shl/file/EGxABJF-Co4oplPtLN87HpSlydj9K_BhCip1sGUvevY?ticket=",
+        )
+    }
+
+  @Test
+  fun `test decodeSHLinkToDocument with no data stored at the external location provided`() {
+    val mockResponse =
+      MockResponse()
+        .setResponseCode(200)
+        .setBody(
+          filesWithLocation,
+        )
+    mockWebServer.enqueue(mockResponse)
+
+    val mockGetLocationResponse = MockResponse().setResponseCode(200).setBody("")
+    mockWebServer.enqueue(mockGetLocationResponse)
+
+    `when`(readSHLinkUtils.extractUrl("fullLink")).thenReturn("extractedJson")
+    `when`(readSHLinkUtils.decodeUrl("extractedJson")).thenReturn("{}".toByteArray())
+    `when`(readSHLinkUtils.decodeShc(anyString(), anyString())).thenReturn(testBundleString)
+    `when`(readSHLinkUtils.extractVerifiableCredential(testBundleString)).thenReturn("")
+
+    val error =
+      assertThrows(Error::class.java) {
+        runBlocking {
+          shLinkDecoderImpl.decodeSHLinkToDocument(
+            exampleSHL,
+            "",
+            "",
+          )
+        }
+      }
+    assertThat(error.message).contains("No data found at the given location")
+  }
+
+  @Test
+  fun `test decodeSHLinkToDocument with an invalid SHL passed in`() {
+    val exception =
+      assertThrows(IllegalArgumentException::class.java) {
+        runBlocking {
+          shLinkDecoderImpl.decodeSHLinkToDocument(
+            "invalidLink",
+            "",
+            "",
+          )
+        }
+      }
+    assertThat(exception.message).isEqualTo("Not a valid SHLink")
+  }
+
+  @Test
+  fun `test decodeSHLinkToDocument with an empty SHL passed in`() {
+    val exception =
+      assertThrows(IllegalArgumentException::class.java) {
+        runBlocking {
+          shLinkDecoderImpl.decodeSHLinkToDocument(
+            "",
+            "",
+            "",
+          )
+        }
+      }
+    assertThat(exception.message).isEqualTo("Not a valid SHLink")
+  }
+
+  @Test
+  fun `test decodeSHLinkToDocument with an unsuccessful POST to the manifest URL`() {
+    val mockResponse =
+      MockResponse().setResponseCode(500).setBody(manifestFileResponseWithLocation.toString())
+    mockWebServer.enqueue(mockResponse)
+
+    `when`(readSHLinkUtils.extractUrl("fullLink")).thenReturn("extractedJson")
+    `when`(readSHLinkUtils.decodeUrl("extractedJson")).thenReturn("{}".toByteArray())
+
+    val exception =
+      assertThrows(Error::class.java) {
+        runBlocking {
+          shLinkDecoderImpl.decodeSHLinkToDocument(
+            exampleSHL,
+            "",
+            "",
+          )
+        }
+      }
+    assertThat(exception.message).contains("Error posting to the manifest:")
+  }
+
+  @Test
+  fun `test decodeSHLinkToDocument with embedded data and verifiable content`() = runBlocking {
+    val mockResponse =
+      MockResponse().setResponseCode(200).setBody(manifestFileResponseWithEmbedded.toString())
+    mockWebServer.enqueue(mockResponse)
+
+    `when`(readSHLinkUtils.extractUrl("fullLink")).thenReturn("extractedJson")
+    `when`(readSHLinkUtils.decodeUrl("extractedJson")).thenReturn("{}".toByteArray())
+    `when`(readSHLinkUtils.decodeShc(anyString(), anyString())).thenReturn(testBundleString)
+    `when`(readSHLinkUtils.extractVerifiableCredential(testBundleString))
+      .thenReturn("verifiableCredentialData")
+    `when`(readSHLinkUtils.decodeAndDecompressPayload("verifiableCredentialData"))
+      .thenReturn(
+        "{\"vc\": {\"credentialSubject\":{\"fhirBundle\":{\"resourceType\":\"Bundle\"}}}}",
+      )
+
+    val result =
+      shLinkDecoderImpl.decodeSHLinkToDocument(
+        exampleSHL,
+        "",
+        "",
+      )
+
+    assertThat(result!!.document).isNotNull()
+
+    val recordedRequestGetManifest: RecordedRequest = mockWebServer.takeRequest()
+    assertThat(recordedRequestGetManifest.path)
+      .isEqualTo(
+        "/shl/xRx3d4C3Q8M0nxZz6fsVXtf2-nPL9pQwAodQeUX71jc",
+      )
+  }
+}
diff --git a/engine/build.gradle.kts b/engine/build.gradle.kts
index 4dbccd672c..24b24ada6c 100644
--- a/engine/build.gradle.kts
+++ b/engine/build.gradle.kts
@@ -38,6 +38,7 @@ android {
     testInstrumentationRunner = Dependencies.androidJunitRunner
     // need to specify this to prevent junit runner from going deep into our dependencies
     testInstrumentationRunnerArguments["package"] = "com.google.android.fhir"
+    consumerProguardFile("proguard-rules.pro")
 
     javaCompileOptions {
       annotationProcessorOptions {
diff --git a/engine/proguard-rules.pro b/engine/proguard-rules.pro
index 2f9dc5a47e..46b0e8bef0 100644
--- a/engine/proguard-rules.pro
+++ b/engine/proguard-rules.pro
@@ -1,21 +1,22 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.kts.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
+## HAPI Strucutres need to be kept beause
+	# 1. Reflection is used in resource extraction as the FHIR Path expression is then translated to field names to locate data elements in FHIR resources.
+	# 2. In HAPI Strucures, ClassLoader is used to load classes from different packages that are hardcoded.
+-keep class ca.uhn.fhir.** { *; }
+-keep class org.hl7.fhir.**  { *; }
+# Used by hapi's XmlUtil which is internally used by hapi's FHIRPathEngine.
+-keep class com.ctc.wstx.stax.**  { *; }
+# Used by HapiWorkerContext (fhirpath engine in QuestionnaireViewModel)
+-keep class com.github.benmanes.caffeine.cache.**  { *; }
+## hapi libs ends
 
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
+## sqlcipher starts
+# see (https://github.com/sqlcipher/android-database-sqlcipher/tree/master#proguard)
+-keep,includedescriptorclasses class net.sqlcipher.** { *; }
+-keep,includedescriptorclasses interface net.sqlcipher.** { *; }
+## sqlcipher ends
 
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
+## retrofit starts
+# see (https://github.com/square/retrofit/issues/3539)
+-keep class com.google.android.fhir.sync.remote.RetrofitHttpService { *; }
+## retrofit ends
+-ignorewarnings
diff --git a/engine/src/main/java/com/google/android/fhir/ContentTypes.kt b/engine/src/main/java/com/google/android/fhir/ContentTypes.kt
index eaad96cf1b..6a491d04c0 100644
--- a/engine/src/main/java/com/google/android/fhir/ContentTypes.kt
+++ b/engine/src/main/java/com/google/android/fhir/ContentTypes.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC
+ * Copyright 2021-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,11 +18,11 @@ package com.google.android.fhir
 
 import okhttp3.MediaType.Companion.toMediaType
 
-object ContentTypes {
+internal object ContentTypes {
   const val APPLICATION_JSON_PATCH = "application/json-patch+json"
   const val APPLICATION_FHIR_JSON = "application/fhir+json"
 }
 
-object MediaTypes {
+internal object MediaTypes {
   val MEDIA_TYPE_FHIR_JSON = ContentTypes.APPLICATION_FHIR_JSON.toMediaType()
 }
diff --git a/engine/src/main/java/com/google/android/fhir/DateProvider.kt b/engine/src/main/java/com/google/android/fhir/DateProvider.kt
index 9d98095f95..b62ea0d7d2 100644
--- a/engine/src/main/java/com/google/android/fhir/DateProvider.kt
+++ b/engine/src/main/java/com/google/android/fhir/DateProvider.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 Google LLC
+ * Copyright 2021-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import java.time.Instant
 import java.time.ZoneId
 
 /** The DateProvider Instance [FhirEngine] uses for date/time related operations. */
-object DateProvider {
+internal object DateProvider {
   lateinit var clock: Clock
   private var fixed = false
   // TODO possibly provide more customization options
diff --git a/engine/src/main/java/com/google/android/fhir/FhirEngine.kt b/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
index fa47d2b21a..58f1807e7e 100644
--- a/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
+++ b/engine/src/main/java/com/google/android/fhir/FhirEngine.kt
@@ -100,16 +100,6 @@ interface FhirEngine {
   /**
    * Searches the database and returns a list of resources matching the [Search] specifications.
    *
-   * Example:
-   * ```
-   * fhirEngine.search<Patient> {
-   *  filter(Patient.GIVEN, {
-   *    value = "Kiran"
-   *    modifier = StringFilterModifier.MATCHES_EXACTLY
-   *  })
-   * }
-   * ```
-   *
    * @param search The search criteria to apply.
    * @return A list of [SearchResult] objects containing the matching resources and any included
    *   references.
diff --git a/engine/src/main/java/com/google/android/fhir/FhirEngineProvider.kt b/engine/src/main/java/com/google/android/fhir/FhirEngineProvider.kt
index 076c0e27ed..ae3ab614fe 100644
--- a/engine/src/main/java/com/google/android/fhir/FhirEngineProvider.kt
+++ b/engine/src/main/java/com/google/android/fhir/FhirEngineProvider.kt
@@ -125,7 +125,7 @@ object FhirEngineProvider {
  * `enableEncryptionIfSupported` is true, the FHIR SDK will only enable database encryption on
  * supported devices.
  *
- * WARNING: If database encryption is enabled, devices that are on API 22 (Android 5.1) or lower
+ * **WARNING:** If database encryption is enabled, devices that are on API 22 (Android 5.1) or lower
  * will have an unencrypted database. If those devices are later updated to API 23 or newer, they
  * will encounter an `IllegalStateException`. This is because the database was created without
  * encryption on the older API level, and enabling encryption in the new release will not
@@ -143,11 +143,10 @@ object FhirEngineProvider {
  *   engine with the Search API. These are in addition to the default
  *   [search parameters](https://www.hl7.org/fhir/searchparameter-registry.html) defined in the FHIR
  *   specification. Custom search parameters must be unique and not change existing or default
- *   search parameters.
- *
- * Note: The engine does not automatically reindex resources after new custom search parameters are
- * added. You must manually reindex resources by updating them. Any new CRUD operations on a
- * resource after adding new search parameters will automatically trigger reindexing.
+ *   search parameters.<p> **Note:** The engine does not automatically reindex resources after new
+ *   custom search parameters are added. You must manually reindex resources by updating them. Any
+ *   new CRUD operations on a resource after adding new search parameters will automatically trigger
+ *   reindexing.
  */
 data class FhirEngineConfiguration(
   val enableEncryptionIfSupported: Boolean = false,
@@ -157,6 +156,7 @@ data class FhirEngineConfiguration(
   val customSearchParameters: List<SearchParameter>? = null,
 )
 
+/** How database errors should be handled. */
 enum class DatabaseErrorStrategy {
   /**
    * If unspecified, all database errors will be propagated to the call site. The caller shall
diff --git a/engine/src/main/java/com/google/android/fhir/LocalChange.kt b/engine/src/main/java/com/google/android/fhir/LocalChange.kt
index c790e95862..e1e7d7c8a0 100644
--- a/engine/src/main/java/com/google/android/fhir/LocalChange.kt
+++ b/engine/src/main/java/com/google/android/fhir/LocalChange.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 Google LLC
+ * Copyright 2022-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/engine/src/main/java/com/google/android/fhir/Util.kt b/engine/src/main/java/com/google/android/fhir/Util.kt
index 5c9dc0f69f..5ad65a52e9 100644
--- a/engine/src/main/java/com/google/android/fhir/Util.kt
+++ b/engine/src/main/java/com/google/android/fhir/Util.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2022-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,7 +50,7 @@ internal fun isValidDateOnly(date: String) =
  * The logical (unqualified) part of the ID. For example, if the ID is
  * "http://example.com/fhir/Patient/123/_history/456", then this value would be "123".
  */
-val Resource.logicalId: String
+internal val Resource.logicalId: String
   get() {
     return this.idElement?.idPart.orEmpty()
   }
@@ -62,14 +62,14 @@ val Resource.logicalId: String
  * operation success/failure. TODO: pass along the HTTP result (or any other signal) to determine
  * the outcome of an instance level RESTful operation.
  */
-fun Resource.isUploadSuccess(): Boolean {
+internal fun Resource.isUploadSuccess(): Boolean {
   if (!this.resourceType.equals(ResourceType.OperationOutcome)) return false
   val outcome: OperationOutcome = this as OperationOutcome
   return outcome.issue.isNotEmpty() &&
     outcome.issue.all { it.severity.equals(OperationOutcome.IssueSeverity.INFORMATION) }
 }
 
-class OffsetDateTimeTypeAdapter : TypeAdapter<OffsetDateTime>() {
+internal class OffsetDateTimeTypeAdapter : TypeAdapter<OffsetDateTime>() {
   override fun write(out: JsonWriter, value: OffsetDateTime) {
     out.value(DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(value))
   }
@@ -78,7 +78,7 @@ class OffsetDateTimeTypeAdapter : TypeAdapter<OffsetDateTime>() {
 }
 
 /** Url for the UCUM system of measures. */
-const val ucumUrl = "http://unitsofmeasure.org"
+internal const val ucumUrl = "http://unitsofmeasure.org"
 
 internal fun percentOf(value: Number, total: Number) =
   if (total == 0) 0.0 else value.toDouble() / total.toDouble()
diff --git a/engine/src/main/java/com/google/android/fhir/db/Database.kt b/engine/src/main/java/com/google/android/fhir/db/Database.kt
index 0107f67d2f..251bf21b6c 100644
--- a/engine/src/main/java/com/google/android/fhir/db/Database.kt
+++ b/engine/src/main/java/com/google/android/fhir/db/Database.kt
@@ -196,12 +196,12 @@ internal interface Database {
   ): List<LocalChangeResourceReference>
 }
 
-data class ResourceWithUUID<R>(
+internal data class ResourceWithUUID<R>(
   val uuid: UUID,
   val resource: R,
 )
 
-data class LocalChangeResourceReference(
+internal data class LocalChangeResourceReference(
   val localChangeId: Long,
   val resourceReferenceValue: String,
   val resourceReferencePath: String?,
diff --git a/engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt b/engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt
index b156b46728..b43f64480e 100644
--- a/engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt
+++ b/engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt
@@ -174,12 +174,10 @@ internal class DatabaseImpl(
   }
 
   override suspend fun select(type: ResourceType, id: String): Resource {
-    return db.withTransaction {
-      resourceDao.getResource(resourceId = id, resourceType = type)?.let {
-        iParser.parseResource(it)
-      }
-        ?: throw ResourceNotFoundException(type.name, id)
-    } as Resource
+    return resourceDao.getResource(resourceId = id, resourceType = type)?.let {
+      iParser.parseResource(it) as Resource
+    }
+      ?: throw ResourceNotFoundException(type.name, id)
   }
 
   override suspend fun insertSyncedResources(resources: List<Resource>) {
@@ -386,26 +384,22 @@ internal class DatabaseImpl(
   override suspend fun purge(type: ResourceType, ids: Set<String>, forcePurge: Boolean) {
     db.withTransaction {
       ids.forEach { id ->
-        // To check resource is present in DB else throw ResourceNotFoundException()
+        // 1. Verify resource presence:
         selectEntity(type, id)
-        val localChangeEntityList = localChangeDao.getLocalChanges(type, id)
-        // If local change is not available simply delete resource
-        if (localChangeEntityList.isEmpty()) {
-          resourceDao.deleteResource(resourceId = id, resourceType = type)
-        } else {
-          // local change is available with FORCE_PURGE the delete resource and discard changes from
-          // localChangeEntity table
-          if (forcePurge) {
-            resourceDao.deleteResource(resourceId = id, resourceType = type)
-            localChangeDao.discardLocalChanges(
-              token = LocalChangeToken(localChangeEntityList.map { it.id }),
-            )
-          } else {
-            // local change is available but FORCE_PURGE = false then throw exception
-            throw IllegalStateException(
-              "Resource with type $type and id $id has local changes, either sync with server or FORCE_PURGE required",
-            )
-          }
+
+        // 2. Check for local changes (which can only be cleared without syncing in FORCE_PURGE
+        // mode):
+        val localChanges = localChangeDao.getLocalChanges(type, id)
+        if (localChanges.isNotEmpty() && !forcePurge) {
+          throw IllegalStateException(
+            "Resource with type $type and id $id has local changes, either sync with server or FORCE_PURGE required",
+          )
+        }
+
+        // 3. Delete resource and discard local changes (if applicable):
+        resourceDao.deleteResource(id, type)
+        if (localChanges.isNotEmpty()) {
+          localChangeDao.discardLocalChanges(id, type)
         }
       }
     }
@@ -444,7 +438,7 @@ internal class DatabaseImpl(
   }
 }
 
-data class DatabaseConfig(
+internal data class DatabaseConfig(
   val inMemory: Boolean,
   val enableEncryption: Boolean,
   val databaseErrorStrategy: DatabaseErrorStrategy,
diff --git a/engine/src/main/java/com/google/android/fhir/db/impl/ResourceDatabase.kt b/engine/src/main/java/com/google/android/fhir/db/impl/ResourceDatabase.kt
index 3502ab0b8e..158bb4b146 100644
--- a/engine/src/main/java/com/google/android/fhir/db/impl/ResourceDatabase.kt
+++ b/engine/src/main/java/com/google/android/fhir/db/impl/ResourceDatabase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2023-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -64,14 +64,14 @@ internal abstract class ResourceDatabase : RoomDatabase() {
   abstract fun localChangeDao(): LocalChangeDao
 }
 
-val MIGRATION_1_2 =
+internal val MIGRATION_1_2 =
   object : Migration(1, 2) {
     override fun migrate(database: SupportSQLiteDatabase) {
       database.execSQL("DROP table if exists SyncedResourceEntity")
     }
   }
 
-val MIGRATION_2_3 =
+internal val MIGRATION_2_3 =
   object : Migration(2, 3) {
     override fun migrate(database: SupportSQLiteDatabase) {
       database.execSQL(
@@ -80,7 +80,7 @@ val MIGRATION_2_3 =
     }
   }
 
-val MIGRATION_3_4 =
+internal val MIGRATION_3_4 =
   object : Migration(3, 4) {
     override fun migrate(database: SupportSQLiteDatabase) {
       database.execSQL(
@@ -105,7 +105,7 @@ val MIGRATION_3_4 =
     }
   }
 
-val MIGRATION_4_5 =
+internal val MIGRATION_4_5 =
   object : Migration(4, 5) {
     override fun migrate(database: SupportSQLiteDatabase) {
       database.execSQL(
@@ -115,7 +115,7 @@ val MIGRATION_4_5 =
   }
 
 /** Changes column type of [LocalChangeEntity.timestamp] from [String] to [java.time.Instant]. */
-val MIGRATION_5_6 =
+internal val MIGRATION_5_6 =
   object : Migration(5, 6) {
     override fun migrate(database: SupportSQLiteDatabase) {
       database.execSQL(
@@ -133,7 +133,7 @@ val MIGRATION_5_6 =
   }
 
 /** Add column resourceUuid in [LocalChangeEntity] */
-val MIGRATION_6_7 =
+internal val MIGRATION_6_7 =
   object : Migration(6, 7) {
     override fun migrate(database: SupportSQLiteDatabase) {
       database.execSQL(
@@ -155,7 +155,7 @@ val MIGRATION_6_7 =
   }
 
 /** Create [LocalChangeResourceReferenceEntity] */
-val MIGRATION_7_8 =
+internal val MIGRATION_7_8 =
   object : Migration(7, 8) {
     override fun migrate(database: SupportSQLiteDatabase) {
       database.execSQL(
diff --git a/engine/src/main/java/com/google/android/fhir/db/impl/SQLCipherSupportHelper.kt b/engine/src/main/java/com/google/android/fhir/db/impl/SQLCipherSupportHelper.kt
index eaf8393d51..f761656e11 100644
--- a/engine/src/main/java/com/google/android/fhir/db/impl/SQLCipherSupportHelper.kt
+++ b/engine/src/main/java/com/google/android/fhir/db/impl/SQLCipherSupportHelper.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2023-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@ import net.sqlcipher.database.SQLiteOpenHelper
 import timber.log.Timber
 
 /** A [SupportSQLiteOpenHelper] which initializes a [SQLiteDatabase] with a passphrase. */
-class SQLCipherSupportHelper(
+internal class SQLCipherSupportHelper(
   private val configuration: SupportSQLiteOpenHelper.Configuration,
   hook: SQLiteDatabaseHook? = null,
   private val databaseErrorStrategy: DatabaseErrorStrategy,
diff --git a/engine/src/main/java/com/google/android/fhir/index/DualHapiWorkerContext.kt b/engine/src/main/java/com/google/android/fhir/index/DualHapiWorkerContext.kt
index bfd12c5422..02306848ce 100644
--- a/engine/src/main/java/com/google/android/fhir/index/DualHapiWorkerContext.kt
+++ b/engine/src/main/java/com/google/android/fhir/index/DualHapiWorkerContext.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2023-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ import org.hl7.fhir.r4.model.Resource
  *
  * TODO: Ideally we update the upstream's HapiWorkerContext to support ucumServices.
  */
-class DualHapiWorkerContext : SimpleWorkerContext() {
+internal class DualHapiWorkerContext : SimpleWorkerContext() {
   val hapi =
     HapiWorkerContext(
       FhirContext.forR4Cached(),
diff --git a/engine/src/main/java/com/google/android/fhir/index/ResourceIndexer.kt b/engine/src/main/java/com/google/android/fhir/index/ResourceIndexer.kt
index b1c3f81468..8e07a8b5ae 100644
--- a/engine/src/main/java/com/google/android/fhir/index/ResourceIndexer.kt
+++ b/engine/src/main/java/com/google/android/fhir/index/ResourceIndexer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2023-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -389,4 +389,8 @@ internal class ResourceIndexer(
   }
 }
 
-data class SearchParamDefinition(val name: String, val type: SearchParamType, val path: String)
+internal data class SearchParamDefinition(
+  val name: String,
+  val type: SearchParamType,
+  val path: String,
+)
diff --git a/engine/src/main/java/com/google/android/fhir/index/entities/PositionIndex.kt b/engine/src/main/java/com/google/android/fhir/index/entities/PositionIndex.kt
index d052326ef5..f6bcfcc161 100644
--- a/engine/src/main/java/com/google/android/fhir/index/entities/PositionIndex.kt
+++ b/engine/src/main/java/com/google/android/fhir/index/entities/PositionIndex.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC
+ * Copyright 2021-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,4 +21,4 @@ package com.google.android.fhir.index.entities
  *
  * See https://www.hl7.org/fhir/search.html#special.
  */
-data class PositionIndex(val latitude: Double, val longitude: Double)
+internal data class PositionIndex(val latitude: Double, val longitude: Double)
diff --git a/engine/src/main/java/com/google/android/fhir/search/MoreSearch.kt b/engine/src/main/java/com/google/android/fhir/search/MoreSearch.kt
index d2b42c3f1a..44c342200a 100644
--- a/engine/src/main/java/com/google/android/fhir/search/MoreSearch.kt
+++ b/engine/src/main/java/com/google/android/fhir/search/MoreSearch.kt
@@ -248,7 +248,7 @@ private fun Search.getSortOrder(
           //  spotless:off
       """
       LEFT JOIN ${sortTableName.tableName} $tableAlias
-      ON $otherTable.resourceType = $tableAlias.resourceType AND $otherTable.resourceUuid = $tableAlias.resourceUuid AND $tableAlias.index_name = ?
+      ON $otherTable.resourceUuid = $tableAlias.resourceUuid AND $tableAlias.index_name = ?
       """
         //  spotless:on
         }
diff --git a/engine/src/main/java/com/google/android/fhir/search/Search.kt b/engine/src/main/java/com/google/android/fhir/search/Search.kt
index 4b1714c9bc..4d9586b275 100644
--- a/engine/src/main/java/com/google/android/fhir/search/Search.kt
+++ b/engine/src/main/java/com/google/android/fhir/search/Search.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 Google LLC
+ * Copyright 2022-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,23 @@ import com.google.android.fhir.search.query.XFhirQueryTranslator.translate
 import org.hl7.fhir.r4.model.Resource
 import org.hl7.fhir.r4.model.ResourceType
 
+/**
+ * Searches the database and returns a list of resources matching the [Search] specifications.
+ *
+ * Example:
+ * ```
+ * fhirEngine.search<Patient> {
+ *  filter(Patient.GIVEN, {
+ *    value = "Kiran"
+ *    modifier = StringFilterModifier.MATCHES_EXACTLY
+ *  })
+ * }
+ * ```
+ *
+ * @param init The lambda expression used to configure the [Search] object.
+ * @return A list of [SearchResult] objects containing the matching resources and any included
+ *   references.
+ */
 suspend inline fun <reified R : Resource> FhirEngine.search(
   init: Search.() -> Unit,
 ): List<SearchResult<R>> {
diff --git a/engine/src/main/java/com/google/android/fhir/search/query/XFhirQueryTranslator.kt b/engine/src/main/java/com/google/android/fhir/search/query/XFhirQueryTranslator.kt
index ce158d32d9..9681728c0a 100644
--- a/engine/src/main/java/com/google/android/fhir/search/query/XFhirQueryTranslator.kt
+++ b/engine/src/main/java/com/google/android/fhir/search/query/XFhirQueryTranslator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 Google LLC
+ * Copyright 2022-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ import org.hl7.fhir.r4.model.ResourceType
  * http://build.fhir.org/ig/HL7/sdc/expressions.html#x-fhir-query-enhancements and
  * http://hl7.org/fhir/R4/search.html
  */
-object XFhirQueryTranslator {
+internal object XFhirQueryTranslator {
   private const val XFHIR_QUERY_SORT_PARAM = "_sort"
   private const val XFHIR_QUERY_COUNT_PARAM = "_count"
 
diff --git a/engine/src/main/java/com/google/android/fhir/sync/remote/FhirConverterFactory.kt b/engine/src/main/java/com/google/android/fhir/sync/remote/FhirConverterFactory.kt
index fc2fab0c70..bd8fbe63f3 100644
--- a/engine/src/main/java/com/google/android/fhir/sync/remote/FhirConverterFactory.kt
+++ b/engine/src/main/java/com/google/android/fhir/sync/remote/FhirConverterFactory.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2023-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/engine/src/main/java/com/google/android/fhir/sync/upload/patch/Patch.kt b/engine/src/main/java/com/google/android/fhir/sync/upload/patch/Patch.kt
index bf3b6fac68..103aaac1bf 100644
--- a/engine/src/main/java/com/google/android/fhir/sync/upload/patch/Patch.kt
+++ b/engine/src/main/java/com/google/android/fhir/sync/upload/patch/Patch.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2023-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import java.time.Instant
 import org.hl7.fhir.r4.model.Resource
 
 /** Data class for squashed local changes for resource */
-data class Patch(
+internal data class Patch(
   /** The [ResourceType] */
   val resourceType: String,
   /** The resource id [Resource.id] */
diff --git a/engine/src/main/java/com/google/android/fhir/sync/upload/patch/PatchGenerator.kt b/engine/src/main/java/com/google/android/fhir/sync/upload/patch/PatchGenerator.kt
index 1a52da87c8..6dfda6e191 100644
--- a/engine/src/main/java/com/google/android/fhir/sync/upload/patch/PatchGenerator.kt
+++ b/engine/src/main/java/com/google/android/fhir/sync/upload/patch/PatchGenerator.kt
@@ -20,8 +20,8 @@ import com.google.android.fhir.LocalChange
 import com.google.android.fhir.db.Database
 
 /**
- * Generates [Patch]es from [LocalChange]s and output [List<[PatchMapping]>] to keep a mapping of
- * the [LocalChange]s to their corresponding generated [Patch]
+ * Generates [Patch]es from [LocalChange]s and output [List<[StronglyConnectedPatchMappings]>] to
+ * keep a mapping of the [LocalChange]s to their corresponding generated [Patch]
  *
  * INTERNAL ONLY. This interface should NEVER been exposed as an external API because it works
  * together with other components in the upload package to fulfill a specific upload strategy.
@@ -35,7 +35,7 @@ internal interface PatchGenerator {
    * NOTE: different implementations may have requirements on the size of [localChanges] and output
    * certain numbers of [Patch]es.
    */
-  suspend fun generate(localChanges: List<LocalChange>): List<PatchMapping>
+  suspend fun generate(localChanges: List<LocalChange>): List<StronglyConnectedPatchMappings>
 }
 
 internal object PatchGeneratorFactory {
@@ -67,3 +67,14 @@ internal data class PatchMapping(
   val localChanges: List<LocalChange>,
   val generatedPatch: Patch,
 )
+
+/**
+ * Structure to describe the cyclic nature of [PatchMapping].
+ * - A single value in [patchMappings] signifies the acyclic nature of the node.
+ * - Multiple values in [patchMappings] signifies the cyclic nature of the nodes among themselves.
+ *
+ * [StronglyConnectedPatchMappings] is used by the engine to make sure that related resources get
+ * uploaded to the server in the same request to maintain the referential integrity of resources
+ * during creation.
+ */
+internal data class StronglyConnectedPatchMappings(val patchMappings: List<PatchMapping>)
diff --git a/engine/src/main/java/com/google/android/fhir/sync/upload/patch/PatchOrdering.kt b/engine/src/main/java/com/google/android/fhir/sync/upload/patch/PatchOrdering.kt
index c76fb46751..d0bfb5f364 100644
--- a/engine/src/main/java/com/google/android/fhir/sync/upload/patch/PatchOrdering.kt
+++ b/engine/src/main/java/com/google/android/fhir/sync/upload/patch/PatchOrdering.kt
@@ -20,7 +20,26 @@ import androidx.annotation.VisibleForTesting
 import com.google.android.fhir.db.Database
 import com.google.android.fhir.db.LocalChangeResourceReference
 
-private typealias Node = String
+/** Represents a resource e.g. 'Patient/123' , 'Encounter/123'. */
+internal typealias Node = String
+
+/**
+ * Represents a collection of resources with reference to other resource represented as an edge.
+ * e.g. Two Patient resources p1 and p2, each with an encounter and subsequent observation will be
+ * represented as follows
+ *
+ * ```
+ * [
+ *   'Patient/p1' : [],
+ *   'Patient/p2' : [],
+ *   'Encounter/e1' : ['Patient/p1'],  // Encounter.subject
+ *   'Encounter/e2' : ['Patient/p2'],  // Encounter.subject
+ *   'Observation/o1' : ['Patient/p1', 'Encounter/e1'], // Observation.subject, Observation.encounter
+ *   'Observation/o2' : ['Patient/p2', 'Encounter/e2'], // Observation.subject, Observation.encounter
+ *  ]
+ *  ```
+ */
+internal typealias Graph = Map<Node, List<Node>>
 
 /**
  * Orders the [PatchMapping]s to maintain referential integrity during upload.
@@ -53,15 +72,16 @@ internal object PatchOrdering {
    * {D} (UPDATE), then B,C needs to go before the resource A so that referential integrity is
    * retained. Order of D shouldn't matter for the purpose of referential integrity.
    *
-   * @return - A ordered list of the [PatchMapping]s based on the references to other [PatchMapping]
-   *   if the mappings are acyclic
-   * - throws [IllegalStateException] otherwise
+   * @return A ordered list of the [StronglyConnectedPatchMappings] containing:
+   * - [StronglyConnectedPatchMappings] with single value for the [PatchMapping] based on the
+   *   references to other [PatchMapping] if the mappings are acyclic
+   * - [StronglyConnectedPatchMappings] with multiple values for [PatchMapping]s based on the
+   *   references to other [PatchMapping]s if the mappings are cyclic.
    */
-  suspend fun List<PatchMapping>.orderByReferences(
+  suspend fun List<PatchMapping>.sccOrderByReferences(
     database: Database,
-  ): List<PatchMapping> {
+  ): List<StronglyConnectedPatchMappings> {
     val resourceIdToPatchMapping = associateBy { patchMapping -> patchMapping.resourceTypeAndId }
-
     /* Get LocalChangeResourceReferences for all the local changes. A single LocalChange may have
     multiple LocalChangeResourceReference, one for each resource reference in the
     LocalChange.payload.*/
@@ -71,7 +91,10 @@ internal object PatchOrdering {
         .groupBy { it.localChangeId }
 
     val adjacencyList = createAdjacencyListForCreateReferences(localChangeIdToResourceReferenceMap)
-    return createTopologicalOrderedList(adjacencyList).mapNotNull { resourceIdToPatchMapping[it] }
+
+    return StronglyConnectedPatches.scc(adjacencyList).map {
+      StronglyConnectedPatchMappings(it.mapNotNull { resourceIdToPatchMapping[it] })
+    }
   }
 
   /**
@@ -121,22 +144,4 @@ internal object PatchOrdering {
     }
     return references
   }
-
-  private fun createTopologicalOrderedList(adjacencyList: Map<Node, List<Node>>): List<Node> {
-    val stack = ArrayDeque<String>()
-    val visited = mutableSetOf<String>()
-    val currentPath = mutableSetOf<String>()
-
-    fun dfs(key: String) {
-      check(currentPath.add(key)) { "Detected a cycle." }
-      if (visited.add(key)) {
-        adjacencyList[key]?.forEach { dfs(it) }
-        stack.addFirst(key)
-      }
-      currentPath.remove(key)
-    }
-
-    adjacencyList.keys.forEach { dfs(it) }
-    return stack.reversed()
-  }
 }
diff --git a/engine/src/main/java/com/google/android/fhir/sync/upload/patch/PerChangePatchGenerator.kt b/engine/src/main/java/com/google/android/fhir/sync/upload/patch/PerChangePatchGenerator.kt
index 8c787f644e..c208e8c6ea 100644
--- a/engine/src/main/java/com/google/android/fhir/sync/upload/patch/PerChangePatchGenerator.kt
+++ b/engine/src/main/java/com/google/android/fhir/sync/upload/patch/PerChangePatchGenerator.kt
@@ -25,19 +25,23 @@ import com.google.android.fhir.LocalChange
  * maintain an audit trail.
  */
 internal object PerChangePatchGenerator : PatchGenerator {
-  override suspend fun generate(localChanges: List<LocalChange>): List<PatchMapping> =
-    localChanges.map {
-      PatchMapping(
-        localChanges = listOf(it),
-        generatedPatch =
-          Patch(
-            resourceType = it.resourceType,
-            resourceId = it.resourceId,
-            versionId = it.versionId,
-            timestamp = it.timestamp,
-            type = it.type.toPatchType(),
-            payload = it.payload,
-          ),
-      )
-    }
+  override suspend fun generate(
+    localChanges: List<LocalChange>,
+  ): List<StronglyConnectedPatchMappings> =
+    localChanges
+      .map {
+        PatchMapping(
+          localChanges = listOf(it),
+          generatedPatch =
+            Patch(
+              resourceType = it.resourceType,
+              resourceId = it.resourceId,
+              versionId = it.versionId,
+              timestamp = it.timestamp,
+              type = it.type.toPatchType(),
+              payload = it.payload,
+            ),
+        )
+      }
+      .map { StronglyConnectedPatchMappings(listOf(it)) }
 }
diff --git a/engine/src/main/java/com/google/android/fhir/sync/upload/patch/PerResourcePatchGenerator.kt b/engine/src/main/java/com/google/android/fhir/sync/upload/patch/PerResourcePatchGenerator.kt
index 0eaa944008..c524b32302 100644
--- a/engine/src/main/java/com/google/android/fhir/sync/upload/patch/PerResourcePatchGenerator.kt
+++ b/engine/src/main/java/com/google/android/fhir/sync/upload/patch/PerResourcePatchGenerator.kt
@@ -23,7 +23,7 @@ import com.github.fge.jsonpatch.JsonPatch
 import com.google.android.fhir.LocalChange
 import com.google.android.fhir.LocalChange.Type
 import com.google.android.fhir.db.Database
-import com.google.android.fhir.sync.upload.patch.PatchOrdering.orderByReferences
+import com.google.android.fhir.sync.upload.patch.PatchOrdering.sccOrderByReferences
 
 /**
  * Generates a [Patch] for all [LocalChange]es made to a single FHIR resource.
@@ -35,8 +35,10 @@ import com.google.android.fhir.sync.upload.patch.PatchOrdering.orderByReferences
 internal class PerResourcePatchGenerator private constructor(val database: Database) :
   PatchGenerator {
 
-  override suspend fun generate(localChanges: List<LocalChange>): List<PatchMapping> {
-    return generateSquashedChangesMapping(localChanges).orderByReferences(database)
+  override suspend fun generate(
+    localChanges: List<LocalChange>,
+  ): List<StronglyConnectedPatchMappings> {
+    return generateSquashedChangesMapping(localChanges).sccOrderByReferences(database)
   }
 
   @androidx.annotation.VisibleForTesting
diff --git a/engine/src/main/java/com/google/android/fhir/sync/upload/patch/StronglyConnectedPatches.kt b/engine/src/main/java/com/google/android/fhir/sync/upload/patch/StronglyConnectedPatches.kt
new file mode 100644
index 0000000000..216229492b
--- /dev/null
+++ b/engine/src/main/java/com/google/android/fhir/sync/upload/patch/StronglyConnectedPatches.kt
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.fhir.sync.upload.patch
+
+import kotlin.math.min
+
+internal object StronglyConnectedPatches {
+
+  /**
+   * Takes a [directedGraph] and computes all the strongly connected components in the graph.
+   *
+   * @return An ordered List of strongly connected components of the [directedGraph]. The SCCs are
+   *   topologically ordered which may change based on the ordering algorithm and the [Node]s inside
+   *   a SSC may be ordered randomly depending on the path taken by algorithm to discover the nodes.
+   */
+  fun scc(directedGraph: Graph): List<List<Node>> {
+    return findSCCWithTarjan(directedGraph)
+  }
+
+  /**
+   * Finds strongly connected components in topological order. See
+   * https://en.wikipedia.org/wiki/Tarjan%27s_strongly_connected_components_algorithm.
+   */
+  private fun findSCCWithTarjan(diGraph: Graph): List<List<Node>> {
+    // Ideally the graph.keys should have all the nodes in the graph. But use values as well in case
+    // the input graph looks something like [ N1: [N2] ].
+    val nodeToIndex =
+      (diGraph.keys + diGraph.values.flatten().toSet())
+        .mapIndexed { index, s -> s to index }
+        .toMap()
+
+    val sccs = mutableListOf<List<Node>>()
+    val lowLinks = IntArray(nodeToIndex.size)
+    var exploringCounter = 0
+    val discoveryTimes = IntArray(nodeToIndex.size)
+
+    val visitedNodes = BooleanArray(nodeToIndex.size)
+    val nodesCurrentlyInStack = BooleanArray(nodeToIndex.size)
+    val stack = ArrayDeque<Node>()
+
+    fun Node.index() = nodeToIndex[this]!!
+
+    fun dfs(at: Node) {
+      lowLinks[at.index()] = exploringCounter
+      discoveryTimes[at.index()] = exploringCounter
+      visitedNodes[at.index()] = true
+      exploringCounter++
+      stack.addFirst(at)
+      nodesCurrentlyInStack[at.index()] = true
+
+      diGraph[at]?.forEach {
+        if (!visitedNodes[it.index()]) {
+          dfs(it)
+        }
+
+        if (nodesCurrentlyInStack[it.index()]) {
+          lowLinks[at.index()] = min(lowLinks[at.index()], lowLinks[it.index()])
+        }
+      }
+
+      // We have found the head node in the scc.
+      if (lowLinks[at.index()] == discoveryTimes[at.index()]) {
+        val connected = mutableListOf<Node>()
+        var node: Node
+        do {
+          node = stack.removeFirst()
+          connected.add(node)
+          nodesCurrentlyInStack[node.index()] = false
+        } while (node != at && stack.isNotEmpty())
+        sccs.add(connected.reversed())
+      }
+    }
+
+    diGraph.keys.forEach {
+      if (!visitedNodes[it.index()]) {
+        dfs(it)
+      }
+    }
+
+    return sccs
+  }
+}
diff --git a/engine/src/main/java/com/google/android/fhir/sync/upload/request/BundleEntryComponentGenerator.kt b/engine/src/main/java/com/google/android/fhir/sync/upload/request/BundleEntryComponentGenerator.kt
index 372ed59c93..329a2965a9 100644
--- a/engine/src/main/java/com/google/android/fhir/sync/upload/request/BundleEntryComponentGenerator.kt
+++ b/engine/src/main/java/com/google/android/fhir/sync/upload/request/BundleEntryComponentGenerator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2023-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ import org.hl7.fhir.r4.model.UriType
  * [LocalChangeEntity]. See [https://www.hl7.org/fhir/http.html#transaction] for more info regarding
  * the supported [Bundle.HTTPVerb].
  */
-abstract class BundleEntryComponentGenerator(
+internal abstract class BundleEntryComponentGenerator(
   private val httpVerb: Bundle.HTTPVerb,
   private val useETagForUpload: Boolean,
 ) {
diff --git a/engine/src/main/java/com/google/android/fhir/sync/upload/request/TransactionBundleGenerator.kt b/engine/src/main/java/com/google/android/fhir/sync/upload/request/TransactionBundleGenerator.kt
index fa4fc5bc31..d622eee5d9 100644
--- a/engine/src/main/java/com/google/android/fhir/sync/upload/request/TransactionBundleGenerator.kt
+++ b/engine/src/main/java/com/google/android/fhir/sync/upload/request/TransactionBundleGenerator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2023-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@ package com.google.android.fhir.sync.upload.request
 import com.google.android.fhir.LocalChange
 import com.google.android.fhir.sync.upload.patch.Patch
 import com.google.android.fhir.sync.upload.patch.PatchMapping
+import com.google.android.fhir.sync.upload.patch.StronglyConnectedPatchMappings
 import org.hl7.fhir.r4.model.Bundle
 
 /** Generates list of [BundleUploadRequest] of type Transaction [Bundle] from the [Patch]es */
@@ -29,10 +30,38 @@ internal class TransactionBundleGenerator(
     (patch: Patch, useETagForUpload: Boolean) -> BundleEntryComponentGenerator,
 ) : UploadRequestGenerator {
 
+  /**
+   * In order to accommodate cyclic dependencies between [PatchMapping]s and maintain referential
+   * integrity on the server, the [PatchMapping]s in a [StronglyConnectedPatchMappings] are all put
+   * in a single [BundleUploadRequestMapping]. Based on the [generatedBundleSize], the remaining
+   * space of the [BundleUploadRequestMapping] maybe filled with other
+   * [StronglyConnectedPatchMappings] mappings.
+   *
+   * In case a single [StronglyConnectedPatchMappings] has more [PatchMapping]s than the
+   * [generatedBundleSize], [generatedBundleSize] will be ignored so that all of the dependent
+   * mappings in [StronglyConnectedPatchMappings] can be sent in a single [Bundle].
+   */
   override fun generateUploadRequests(
-    mappedPatches: List<PatchMapping>,
+    mappedPatches: List<StronglyConnectedPatchMappings>,
   ): List<BundleUploadRequestMapping> {
-    return mappedPatches.chunked(generatedBundleSize).map { patchList ->
+    val mappingsPerBundle = mutableListOf<List<PatchMapping>>()
+
+    var bundle = mutableListOf<PatchMapping>()
+    mappedPatches.forEach {
+      if ((bundle.size + it.patchMappings.size) <= generatedBundleSize) {
+        bundle.addAll(it.patchMappings)
+      } else {
+        if (bundle.isNotEmpty()) {
+          mappingsPerBundle.add(bundle)
+          bundle = mutableListOf()
+        }
+        bundle.addAll(it.patchMappings)
+      }
+    }
+
+    if (bundle.isNotEmpty()) mappingsPerBundle.add(bundle)
+
+    return mappingsPerBundle.map { patchList ->
       generateBundleRequest(patchList).let { mappedBundleRequest ->
         BundleUploadRequestMapping(
           splitLocalChanges = mappedBundleRequest.first,
diff --git a/engine/src/main/java/com/google/android/fhir/sync/upload/request/UploadRequestGenerator.kt b/engine/src/main/java/com/google/android/fhir/sync/upload/request/UploadRequestGenerator.kt
index 51ae7711ff..86af7a4b64 100644
--- a/engine/src/main/java/com/google/android/fhir/sync/upload/request/UploadRequestGenerator.kt
+++ b/engine/src/main/java/com/google/android/fhir/sync/upload/request/UploadRequestGenerator.kt
@@ -19,19 +19,20 @@ package com.google.android.fhir.sync.upload.request
 import com.google.android.fhir.LocalChange
 import com.google.android.fhir.sync.upload.patch.Patch
 import com.google.android.fhir.sync.upload.patch.PatchMapping
+import com.google.android.fhir.sync.upload.patch.StronglyConnectedPatchMappings
 import org.hl7.fhir.r4.model.Bundle
 import org.hl7.fhir.r4.model.codesystems.HttpVerb
 
 /**
  * Generator that generates [UploadRequest]s from the [Patch]es present in the
- * [List<[PatchMapping]>]. Any implementation of this generator is expected to output
- * [List<[UploadRequestMapping]>] which maps [UploadRequest] to the corresponding [LocalChange]s it
- * was generated from.
+ * [List<[StronglyConnectedPatchMappings]>]. Any implementation of this generator is expected to
+ * output [List<[UploadRequestMapping]>] which maps [UploadRequest] to the corresponding
+ * [LocalChange]s it was generated from.
  */
 internal interface UploadRequestGenerator {
   /** Generates a list of [UploadRequestMapping] from the [PatchMapping]s */
   fun generateUploadRequests(
-    mappedPatches: List<PatchMapping>,
+    mappedPatches: List<StronglyConnectedPatchMappings>,
   ): List<UploadRequestMapping>
 }
 
diff --git a/engine/src/main/java/com/google/android/fhir/sync/upload/request/UrlRequestGenerator.kt b/engine/src/main/java/com/google/android/fhir/sync/upload/request/UrlRequestGenerator.kt
index 5fbb174e8a..8e576760c3 100644
--- a/engine/src/main/java/com/google/android/fhir/sync/upload/request/UrlRequestGenerator.kt
+++ b/engine/src/main/java/com/google/android/fhir/sync/upload/request/UrlRequestGenerator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2023-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@ import ca.uhn.fhir.context.FhirVersionEnum
 import com.google.android.fhir.ContentTypes
 import com.google.android.fhir.sync.upload.patch.Patch
 import com.google.android.fhir.sync.upload.patch.PatchMapping
+import com.google.android.fhir.sync.upload.patch.StronglyConnectedPatchMappings
 import org.hl7.fhir.r4.model.Binary
 import org.hl7.fhir.r4.model.Resource
 import org.hl7.fhir.r4.model.codesystems.HttpVerb
@@ -30,15 +31,30 @@ internal class UrlRequestGenerator(
   private val getUrlRequestForPatch: (patch: Patch) -> UrlUploadRequest,
 ) : UploadRequestGenerator {
 
+  /**
+   * Since a [UrlUploadRequest] can only handle a single resource request, the
+   * [StronglyConnectedPatchMappings.patchMappings] are flattened and handled as acyclic mapping to
+   * generate [UrlUploadRequestMapping] for each [PatchMapping].
+   *
+   * **NOTE**
+   *
+   * Since the referential integrity on the sever may get violated if the subsequent requests have
+   * cyclic dependency on each other, We may introduce configuration for application to provide
+   * server's referential integrity settings and make it illegal to generate [UrlUploadRequest] when
+   * server has strict referential integrity and the requests have cyclic dependency amongst itself.
+   */
   override fun generateUploadRequests(
-    mappedPatches: List<PatchMapping>,
+    mappedPatches: List<StronglyConnectedPatchMappings>,
   ): List<UrlUploadRequestMapping> =
-    mappedPatches.map {
-      UrlUploadRequestMapping(
-        localChanges = it.localChanges,
-        generatedRequest = getUrlRequestForPatch(it.generatedPatch),
-      )
-    }
+    mappedPatches
+      .map { it.patchMappings }
+      .flatten()
+      .map {
+        UrlUploadRequestMapping(
+          localChanges = it.localChanges,
+          generatedRequest = getUrlRequestForPatch(it.generatedPatch),
+        )
+      }
 
   companion object Factory {
 
diff --git a/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt b/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
index e6c0441158..c99e17be73 100644
--- a/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
+++ b/engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
@@ -55,21 +55,21 @@ import org.hl7.fhir.r4.model.ResourceType
 import org.json.JSONArray
 import org.json.JSONObject
 
-val jsonParser: IParser = FhirContext.forCached(FhirVersionEnum.R4).newJsonParser()
+internal val jsonParser: IParser = FhirContext.forCached(FhirVersionEnum.R4).newJsonParser()
 
 /** Asserts that the `expected` and the `actual` FHIR resources are equal. */
-fun assertResourceEquals(expected: Resource?, actual: Resource?) {
+internal fun assertResourceEquals(expected: Resource?, actual: Resource?) {
   assertThat(jsonParser.encodeResourceToString(actual))
     .isEqualTo(jsonParser.encodeResourceToString(expected))
 }
 
 /** Asserts that the `expected` and the `actual` FHIR resources are not equal. */
-fun assertResourceNotEquals(expected: Resource?, actual: Resource?) {
+internal fun assertResourceNotEquals(expected: Resource?, actual: Resource?) {
   assertThat(jsonParser.encodeResourceToString(actual))
     .isNotEqualTo(jsonParser.encodeResourceToString(expected))
 }
 
-fun assertJsonArrayEqualsIgnoringOrder(actual: JSONArray, expected: JSONArray) {
+internal fun assertJsonArrayEqualsIgnoringOrder(actual: JSONArray, expected: JSONArray) {
   assertThat(actual.length()).isEqualTo(expected.length())
   val actuals = mutableListOf<String>()
   val expecteds = mutableListOf<String>()
@@ -83,7 +83,7 @@ fun assertJsonArrayEqualsIgnoringOrder(actual: JSONArray, expected: JSONArray) {
 }
 
 /** Reads a [Resource] from given file in the `sampledata` dir */
-fun <R : Resource> readFromFile(clazz: Class<R>, filename: String): R {
+internal fun <R : Resource> readFromFile(clazz: Class<R>, filename: String): R {
   val resourceJson = readJsonFromFile(filename)
   return jsonParser.parseResource(clazz, resourceJson.toString()) as R
 }
@@ -96,13 +96,13 @@ private fun readJsonFromFile(filename: String): JSONObject {
 }
 
 /** Reads a [JSONArray] from given file in the `sampledata` dir */
-fun readJsonArrayFromFile(filename: String): JSONArray {
+internal fun readJsonArrayFromFile(filename: String): JSONArray {
   val inputStream = {}.javaClass.getResourceAsStream(filename)
   val content = inputStream!!.bufferedReader(Charsets.UTF_8).readText()
   return JSONArray(content)
 }
 
-object TestDataSourceImpl : DataSource {
+internal object TestDataSourceImpl : DataSource {
 
   override suspend fun download(downloadRequest: DownloadRequest) =
     when (downloadRequest) {
@@ -120,7 +120,7 @@ object TestDataSourceImpl : DataSource {
   }
 }
 
-open class TestDownloadManagerImpl(
+internal open class TestDownloadManagerImpl(
   private val queries: List<String> = listOf("Patient?address-city=NAIROBI"),
 ) : DownloadWorkManager {
   private val urls = LinkedList(queries)
@@ -141,7 +141,7 @@ open class TestDownloadManagerImpl(
   }
 }
 
-object TestFhirEngineImpl : FhirEngine {
+internal object TestFhirEngineImpl : FhirEngine {
   override suspend fun create(vararg resource: Resource) = emptyList<String>()
 
   override suspend fun update(vararg resource: Resource) {}
@@ -204,7 +204,7 @@ object TestFhirEngineImpl : FhirEngine {
   override suspend fun purge(type: ResourceType, ids: Set<String>, forcePurge: Boolean) {}
 }
 
-object TestFailingDatasource : DataSource {
+internal object TestFailingDatasource : DataSource {
 
   override suspend fun download(downloadRequest: DownloadRequest) =
     when (downloadRequest) {
@@ -223,7 +223,8 @@ object TestFailingDatasource : DataSource {
   }
 }
 
-class BundleDataSource(val onPostBundle: suspend (BundleUploadRequest) -> Resource) : DataSource {
+internal class BundleDataSource(val onPostBundle: suspend (BundleUploadRequest) -> Resource) :
+  DataSource {
 
   override suspend fun download(downloadRequest: DownloadRequest): Resource {
     TODO("Not yet implemented")
@@ -233,7 +234,7 @@ class BundleDataSource(val onPostBundle: suspend (BundleUploadRequest) -> Resour
     onPostBundle((request as BundleUploadRequest))
 }
 
-class UrlRequestDataSource(val onUrlRequestSend: suspend (UrlUploadRequest) -> Resource) :
+internal class UrlRequestDataSource(val onUrlRequestSend: suspend (UrlUploadRequest) -> Resource) :
   DataSource {
 
   override suspend fun download(downloadRequest: DownloadRequest): Resource {
diff --git a/engine/src/test/java/com/google/android/fhir/search/SearchTest.kt b/engine/src/test/java/com/google/android/fhir/search/SearchTest.kt
index 11f9c93a8f..d46c110664 100644
--- a/engine/src/test/java/com/google/android/fhir/search/SearchTest.kt
+++ b/engine/src/test/java/com/google/android/fhir/search/SearchTest.kt
@@ -1717,7 +1717,7 @@ class SearchTest {
         SELECT a.resourceUuid, a.serializedResource
         FROM ResourceEntity a
         LEFT JOIN StringIndexEntity b
-        ON a.resourceType = b.resourceType AND a.resourceUuid = b.resourceUuid AND b.index_name = ?
+        ON a.resourceUuid = b.resourceUuid AND b.index_name = ?
         WHERE a.resourceType = ?
         ORDER BY b.index_value ASC
                 """
@@ -1737,7 +1737,7 @@ class SearchTest {
         SELECT a.resourceUuid, a.serializedResource
         FROM ResourceEntity a
         LEFT JOIN StringIndexEntity b
-        ON a.resourceType = b.resourceType AND a.resourceUuid = b.resourceUuid AND b.index_name = ?
+        ON a.resourceUuid = b.resourceUuid AND b.index_name = ?
         WHERE a.resourceType = ?
         ORDER BY b.index_value DESC
                 """
@@ -1759,7 +1759,7 @@ class SearchTest {
         SELECT a.resourceUuid, a.serializedResource
         FROM ResourceEntity a
         LEFT JOIN NumberIndexEntity b
-        ON a.resourceType = b.resourceType AND a.resourceUuid = b.resourceUuid AND b.index_name = ?
+        ON a.resourceUuid = b.resourceUuid AND b.index_name = ?
         WHERE a.resourceType = ?
         ORDER BY b.index_value ASC
                 """
@@ -1785,7 +1785,7 @@ class SearchTest {
         SELECT a.resourceUuid, a.serializedResource
         FROM ResourceEntity a
         LEFT JOIN StringIndexEntity b
-        ON a.resourceType = b.resourceType AND a.resourceUuid = b.resourceUuid AND b.index_name = ?
+        ON a.resourceUuid = b.resourceUuid AND b.index_name = ?
         WHERE a.resourceType = ?
         AND a.resourceUuid IN (
         SELECT resourceUuid FROM StringIndexEntity
@@ -2041,9 +2041,9 @@ class SearchTest {
         SELECT a.resourceUuid, a.serializedResource
         FROM ResourceEntity a
         LEFT JOIN DateIndexEntity b
-        ON a.resourceType = b.resourceType AND a.resourceUuid = b.resourceUuid AND b.index_name = ?
+        ON a.resourceUuid = b.resourceUuid AND b.index_name = ?
         LEFT JOIN DateTimeIndexEntity c
-        ON a.resourceType = c.resourceType AND a.resourceUuid = c.resourceUuid AND c.index_name = ?
+        ON a.resourceUuid = c.resourceUuid AND c.index_name = ?
         WHERE a.resourceType = ?
         ORDER BY b.index_from ASC, c.index_from ASC
                 """
@@ -2062,9 +2062,9 @@ class SearchTest {
         SELECT a.resourceUuid, a.serializedResource
         FROM ResourceEntity a
         LEFT JOIN DateIndexEntity b
-        ON a.resourceType = b.resourceType AND a.resourceUuid = b.resourceUuid AND b.index_name = ?
+        ON a.resourceUuid = b.resourceUuid AND b.index_name = ?
         LEFT JOIN DateTimeIndexEntity c
-        ON a.resourceType = c.resourceType AND a.resourceUuid = c.resourceUuid AND c.index_name = ?
+        ON a.resourceUuid = c.resourceUuid AND c.index_name = ?
         WHERE a.resourceType = ?
         ORDER BY b.index_from DESC, c.index_from DESC
                 """
@@ -2374,7 +2374,7 @@ class SearchTest {
           JOIN ReferenceIndexEntity rie
           ON re.resourceType||"/"||re.resourceId = rie.index_value
           LEFT JOIN StringIndexEntity b
-          ON re.resourceType = b.resourceType AND re.resourceUuid = b.resourceUuid AND b.index_name = ?
+          ON re.resourceUuid = b.resourceUuid AND b.index_name = ?
           WHERE rie.resourceType = ?  AND rie.index_name = ?  AND rie.resourceUuid IN (?, ?) AND re.resourceType = ?
           AND re.resourceUuid IN (
           SELECT resourceUuid FROM TokenIndexEntity
@@ -2433,7 +2433,7 @@ class SearchTest {
         JOIN ReferenceIndexEntity rie
         ON re.resourceType||"/"||re.resourceId = rie.index_value
         LEFT JOIN StringIndexEntity b
-        ON re.resourceType = b.resourceType AND re.resourceUuid = b.resourceUuid AND b.index_name = ?
+        ON re.resourceUuid = b.resourceUuid AND b.index_name = ?
         WHERE rie.resourceType = ?  AND rie.index_name = ?  AND rie.resourceUuid IN (?, ?) AND re.resourceType = ?
         AND re.resourceUuid IN (
         SELECT resourceUuid FROM TokenIndexEntity
@@ -2448,7 +2448,7 @@ class SearchTest {
         JOIN ReferenceIndexEntity rie
         ON re.resourceType||"/"||re.resourceId = rie.index_value
         LEFT JOIN StringIndexEntity b
-        ON re.resourceType = b.resourceType AND re.resourceUuid = b.resourceUuid AND b.index_name = ?
+        ON re.resourceUuid = b.resourceUuid AND b.index_name = ?
         WHERE rie.resourceType = ?  AND rie.index_name = ?  AND rie.resourceUuid IN (?, ?) AND re.resourceType = ?
         AND re.resourceUuid IN (
         SELECT resourceUuid FROM TokenIndexEntity
@@ -2592,9 +2592,9 @@ class SearchTest {
         JOIN ReferenceIndexEntity rie
         ON re.resourceUuid = rie.resourceUuid
         LEFT JOIN DateIndexEntity b
-        ON re.resourceType = b.resourceType AND re.resourceUuid = b.resourceUuid AND b.index_name = ?
+        ON re.resourceUuid = b.resourceUuid AND b.index_name = ?
         LEFT JOIN DateTimeIndexEntity c
-        ON re.resourceType = c.resourceType AND re.resourceUuid = c.resourceUuid AND c.index_name = ?
+        ON re.resourceUuid = c.resourceUuid AND c.index_name = ?
         WHERE rie.resourceType = ?  AND rie.index_name = ?  AND rie.index_value IN (?, ?) AND re.resourceType = ?
         AND re.resourceUuid IN (
         SELECT resourceUuid FROM TokenIndexEntity
@@ -2669,9 +2669,9 @@ class SearchTest {
           JOIN ReferenceIndexEntity rie
           ON re.resourceUuid = rie.resourceUuid
           LEFT JOIN DateIndexEntity b
-          ON re.resourceType = b.resourceType AND re.resourceUuid = b.resourceUuid AND b.index_name = ?
+          ON re.resourceUuid = b.resourceUuid AND b.index_name = ?
           LEFT JOIN DateTimeIndexEntity c
-          ON re.resourceType = c.resourceType AND re.resourceUuid = c.resourceUuid AND c.index_name = ?
+          ON re.resourceUuid = c.resourceUuid AND c.index_name = ?
           WHERE rie.resourceType = ?  AND rie.index_name = ?  AND rie.index_value IN (?, ?) AND re.resourceType = ?
           AND re.resourceUuid IN (
           SELECT resourceUuid FROM TokenIndexEntity
@@ -2686,9 +2686,9 @@ class SearchTest {
           JOIN ReferenceIndexEntity rie
           ON re.resourceUuid = rie.resourceUuid
           LEFT JOIN DateIndexEntity b
-          ON re.resourceType = b.resourceType AND re.resourceUuid = b.resourceUuid AND b.index_name = ?
+          ON re.resourceUuid = b.resourceUuid AND b.index_name = ?
           LEFT JOIN DateTimeIndexEntity c
-          ON re.resourceType = c.resourceType AND re.resourceUuid = c.resourceUuid AND c.index_name = ?
+          ON re.resourceUuid = c.resourceUuid AND c.index_name = ?
           WHERE rie.resourceType = ?  AND rie.index_name = ?  AND rie.index_value IN (?, ?) AND re.resourceType = ?
           AND re.resourceUuid IN (
           SELECT resourceUuid FROM TokenIndexEntity
diff --git a/engine/src/test/java/com/google/android/fhir/sync/FhirSyncWorkerTest.kt b/engine/src/test/java/com/google/android/fhir/sync/FhirSyncWorkerTest.kt
index 8932338bb1..ba51d5d5e6 100644
--- a/engine/src/test/java/com/google/android/fhir/sync/FhirSyncWorkerTest.kt
+++ b/engine/src/test/java/com/google/android/fhir/sync/FhirSyncWorkerTest.kt
@@ -42,7 +42,7 @@ import org.robolectric.annotation.Config
 
 @RunWith(RobolectricTestRunner::class)
 @Config(manifest = Config.NONE)
-class FhirSyncWorkerTest {
+internal class FhirSyncWorkerTest {
   private lateinit var context: Context
 
   class PassingPeriodicSyncWorker(appContext: Context, workerParams: WorkerParameters) :
diff --git a/engine/src/test/java/com/google/android/fhir/sync/upload/patch/PatchOrderingTest.kt b/engine/src/test/java/com/google/android/fhir/sync/upload/patch/PatchOrderingTest.kt
index 44f8889dc8..f6bcae7883 100644
--- a/engine/src/test/java/com/google/android/fhir/sync/upload/patch/PatchOrderingTest.kt
+++ b/engine/src/test/java/com/google/android/fhir/sync/upload/patch/PatchOrderingTest.kt
@@ -28,8 +28,6 @@ import com.google.android.fhir.versionId
 import com.google.common.truth.Truth.assertThat
 import java.time.Instant
 import java.util.LinkedList
-import kotlin.random.Random
-import kotlin.test.assertFailsWith
 import kotlinx.coroutines.test.runTest
 import org.hl7.fhir.r4.model.Encounter
 import org.hl7.fhir.r4.model.Group
@@ -185,7 +183,7 @@ class PatchOrderingTest {
     // This order is based on the current implementation of the topological sort in [PatchOrdering],
     // it's entirely possible to generate different order here which is acceptable/correct, should
     // we have a different implementation of the topological sort.
-    assertThat(result.map { it.generatedPatch.resourceId })
+    assertThat(result.map { it.patchMappings.single().generatedPatch.resourceId })
       .containsExactly(
         "patient-1",
         "patient-2",
@@ -202,53 +200,46 @@ class PatchOrderingTest {
   }
 
   @Test
-  fun `generate with cyclic references should throw exception`() = runTest {
-    val localChanges = LinkedList<LocalChange>()
-    val localChangeResourceReferences = mutableListOf<LocalChangeResourceReference>()
+  fun `generate with cyclic and acyclic references should generate both Individual and Combined mappings`() =
+    runTest {
+      val helper = LocalChangeHelper()
 
-    Patient()
-      .apply {
-        id = "patient-1"
-        addLink(
-          Patient.PatientLinkComponent().apply { other = Reference("RelatedPerson/related-1") },
-        )
-      }
-      .also {
-        localChanges.add(createInsertLocalChange(it, Random.nextLong()))
-        localChangeResourceReferences.add(
-          LocalChangeResourceReference(
-            localChanges.last().token.ids.first(),
-            "RelatedPerson/related-1",
-            "Patient.other",
-          ),
-        )
-      }
-
-    RelatedPerson()
-      .apply {
-        id = "related-1"
-        patient = Reference("Patient/patient-1")
-      }
-      .also {
-        localChanges.add(createInsertLocalChange(it))
-        localChangeResourceReferences.add(
-          LocalChangeResourceReference(
-            localChanges.last().token.ids.first(),
-            "Patient/patient-1",
-            "RelatedPerson.patient",
-          ),
-        )
-      }
+      // Patient and RelatedPerson have cyclic dependency
+      helper.createPatient("patient-1", 1, "related-1")
+      helper.createRelatedPerson("related-1", 2, "Patient/patient-1")
 
-    whenever(database.getLocalChangeResourceReferences(any()))
-      .thenReturn(localChangeResourceReferences)
+      // Patient, RelatedPerson have cyclic dependency. Observation, Encounter and Patient have
+      // acyclic dependency and order doesn't matter since they all go in same bundle.
+      helper.createPatient("patient-2", 3, "related-2")
+      helper.createRelatedPerson("related-2", 4, "Patient/patient-2")
+      helper.createObservation("observation-1", 5, "Patient/patient-2", "Encounter/encounter-1")
+      helper.createEncounter("encounter-1", 6, "Patient/patient-2")
 
-    val errorMessage =
-      assertFailsWith<IllegalStateException> { patchGenerator.generate(localChanges) }
-        .localizedMessage
+      // observation , encounter and Patient have acyclic dependency with each other, hence order is
+      // important here.
+      helper.createObservation("observation-2", 7, "Patient/patient-3", "Encounter/encounter-2")
+      helper.createEncounter("encounter-2", 8, "Patient/patient-3")
+      helper.createPatient("patient-3", 9)
 
-    assertThat(errorMessage).isEqualTo("Detected a cycle.")
-  }
+      whenever(database.getLocalChangeResourceReferences(any()))
+        .thenReturn(helper.localChangeResourceReferences)
+
+      val result = patchGenerator.generate(helper.localChanges)
+
+      assertThat(
+          result.map { it.patchMappings.map { it.generatedPatch.resourceId } },
+        )
+        .containsExactly(
+          listOf("patient-1", "related-1"),
+          listOf("patient-2", "related-2"),
+          listOf("encounter-1"),
+          listOf("observation-1"),
+          listOf("patient-3"),
+          listOf("encounter-2"),
+          listOf("observation-2"),
+        )
+        .inOrder()
+    }
 
   companion object {
 
@@ -319,10 +310,29 @@ class PatchOrderingTest {
     fun createPatient(
       id: String,
       changeId: Long,
+      relatedPersonId: String? = null,
     ) =
       Patient()
-        .apply { this.id = id }
-        .also { localChanges.add(createInsertLocalChange(it, changeId)) }
+        .apply {
+          this.id = id
+          relatedPersonId?.let {
+            addLink(
+              Patient.PatientLinkComponent().apply { other = Reference("RelatedPerson/$it") },
+            )
+          }
+        }
+        .also {
+          localChanges.add(createInsertLocalChange(it, changeId))
+          relatedPersonId?.let {
+            localChangeResourceReferences.add(
+              LocalChangeResourceReference(
+                localChanges.last().token.ids.first(),
+                "RelatedPerson/$relatedPersonId",
+                "Patient.other",
+              ),
+            )
+          }
+        }
 
     fun updatePatient(
       patient: Patient,
@@ -383,5 +393,26 @@ class PatchOrderingTest {
             ),
           )
         }
+
+    fun createRelatedPerson(
+      id: String,
+      changeId: Long,
+      patient: String,
+    ) =
+      RelatedPerson()
+        .apply {
+          this.id = id
+          this.patient = Reference(patient)
+        }
+        .also {
+          localChanges.add(createInsertLocalChange(it, changeId))
+          localChangeResourceReferences.add(
+            LocalChangeResourceReference(
+              localChanges.last().token.ids.first(),
+              patient,
+              "RelatedPerson.patient",
+            ),
+          )
+        }
   }
 }
diff --git a/engine/src/test/java/com/google/android/fhir/sync/upload/patch/PerResourcePatchGeneratorTest.kt b/engine/src/test/java/com/google/android/fhir/sync/upload/patch/PerResourcePatchGeneratorTest.kt
index 4860b66cdc..38811c581d 100644
--- a/engine/src/test/java/com/google/android/fhir/sync/upload/patch/PerResourcePatchGeneratorTest.kt
+++ b/engine/src/test/java/com/google/android/fhir/sync/upload/patch/PerResourcePatchGeneratorTest.kt
@@ -69,7 +69,8 @@ class PerResourcePatchGeneratorTest {
     val patient: Patient = readFromFile(Patient::class.java, "/date_test_patient.json")
     val insertionLocalChange = createInsertLocalChange(patient)
 
-    val patches = patchGenerator.generate(listOf(insertionLocalChange))
+    val patches =
+      patchGenerator.generate(listOf(insertionLocalChange)).map { it.patchMappings.single() }
 
     with(patches.single()) {
       with(generatedPatch) {
@@ -100,7 +101,8 @@ class PerResourcePatchGeneratorTest {
     val updateLocalChange1 = createUpdateLocalChange(remotePatient, updatedPatient1, 1L)
     val updatePatch = readJsonArrayFromFile("/update_patch_1.json")
 
-    val patches = patchGenerator.generate(listOf(updateLocalChange1))
+    val patches =
+      patchGenerator.generate(listOf(updateLocalChange1)).map { it.patchMappings.single() }
 
     with(patches.single()) {
       with(generatedPatch) {
@@ -129,7 +131,8 @@ class PerResourcePatchGeneratorTest {
     remotePatient.meta = remoteMeta
     val deleteLocalChange = createDeleteLocalChange(remotePatient, 3L)
 
-    val patches = patchGenerator.generate(listOf(deleteLocalChange))
+    val patches =
+      patchGenerator.generate(listOf(deleteLocalChange)).map { it.patchMappings.single() }
 
     with(patches.single()) {
       with(generatedPatch) {
@@ -155,7 +158,10 @@ class PerResourcePatchGeneratorTest {
     val updateLocalChange = createUpdateLocalChange(patient, updatedPatient, 1L)
     val patientString = jsonParser.encodeResourceToString(updatedPatient)
 
-    val patches = patchGenerator.generate(listOf(insertionLocalChange, updateLocalChange))
+    val patches =
+      patchGenerator.generate(listOf(insertionLocalChange, updateLocalChange)).map {
+        it.patchMappings.single()
+      }
 
     with(patches.single()) {
       with(generatedPatch) {
@@ -312,7 +318,10 @@ class PerResourcePatchGeneratorTest {
     val updateLocalChange2 = createUpdateLocalChange(updatedPatient1, updatedPatient2, 2L)
     val updatePatch = readJsonArrayFromFile("/update_patch_2.json")
 
-    val patches = patchGenerator.generate(listOf(updateLocalChange1, updateLocalChange2))
+    val patches =
+      patchGenerator.generate(listOf(updateLocalChange1, updateLocalChange2)).map {
+        it.patchMappings.single()
+      }
 
     with(patches.single()) {
       with(generatedPatch) {
@@ -357,7 +366,10 @@ class PerResourcePatchGeneratorTest {
           token = LocalChangeToken(listOf(1)),
         )
 
-      val patches = patchGenerator.generate(listOf(updatedLocalChange1, updatedLocalChange2))
+      val patches =
+        patchGenerator.generate(listOf(updatedLocalChange1, updatedLocalChange2)).map {
+          it.patchMappings.single()
+        }
 
       with(patches.single().generatedPatch) {
         assertThat(type).isEqualTo(Patch.Type.UPDATE)
@@ -385,9 +397,11 @@ class PerResourcePatchGeneratorTest {
     val deleteLocalChange = createDeleteLocalChange(updatedPatient2, 3L)
 
     val patches =
-      patchGenerator.generate(
-        listOf(updateLocalChange1, updateLocalChange2, deleteLocalChange),
-      )
+      patchGenerator
+        .generate(
+          listOf(updateLocalChange1, updateLocalChange2, deleteLocalChange),
+        )
+        .map { it.patchMappings.single() }
 
     with(patches.single()) {
       with(generatedPatch) {
diff --git a/engine/src/test/java/com/google/android/fhir/sync/upload/patch/StronglyConnectedPatchesTest.kt b/engine/src/test/java/com/google/android/fhir/sync/upload/patch/StronglyConnectedPatchesTest.kt
new file mode 100644
index 0000000000..382dd65e71
--- /dev/null
+++ b/engine/src/test/java/com/google/android/fhir/sync/upload/patch/StronglyConnectedPatchesTest.kt
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.fhir.sync.upload.patch
+
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+@RunWith(RobolectricTestRunner::class)
+class StronglyConnectedPatchesTest {
+
+  @Test
+  fun `sscOrdered should return strongly connected components in order`() {
+    val graph = mutableMapOf<String, MutableList<String>>()
+
+    graph.addEdge("0", "1")
+    graph.addEdge("1", "2")
+    graph.addEdge("2", "1")
+
+    graph.addEdge("3", "4")
+    graph.addEdge("4", "5")
+    graph.addEdge("5", "3")
+
+    graph.addEdge("6", "7")
+    graph.addEdge("7", "8")
+
+    val result = StronglyConnectedPatches.scc(graph)
+
+    assertThat(result)
+      .containsExactly(
+        listOf("1", "2"),
+        listOf("0"),
+        listOf("3", "4", "5"),
+        listOf("8"),
+        listOf("7"),
+        listOf("6"),
+      )
+      .inOrder()
+  }
+
+  @Test
+  fun `sscOrdered empty graph should return empty result`() {
+    val graph = mutableMapOf<String, MutableList<String>>()
+    val result = StronglyConnectedPatches.scc(graph)
+    assertThat(result).isEmpty()
+  }
+
+  @Test
+  fun `sscOrdered  graph with single node should return single scc`() {
+    val graph = mutableMapOf<String, MutableList<String>>()
+    graph.addNode("0")
+    val result = StronglyConnectedPatches.scc(graph)
+    assertThat(result).containsExactly(listOf("0"))
+  }
+
+  @Test
+  fun `sscOrdered  graph with two node should return two scc`() {
+    val graph = mutableMapOf<String, MutableList<String>>()
+    graph.addNode("0")
+    graph.addNode("1")
+    val result = StronglyConnectedPatches.scc(graph)
+    assertThat(result).containsExactly(listOf("0"), listOf("1"))
+  }
+
+  @Test
+  fun `sscOrdered  graph with two acyclic node should return two scc in order`() {
+    val graph = mutableMapOf<String, MutableList<String>>()
+    graph.addEdge("1", "0")
+    val result = StronglyConnectedPatches.scc(graph)
+    assertThat(result).containsExactly(listOf("0"), listOf("1")).inOrder()
+  }
+
+  @Test
+  fun `sscOrdered  graph with two cyclic node should return single scc`() {
+    val graph = mutableMapOf<String, MutableList<String>>()
+    graph.addEdge("0", "1")
+    graph.addEdge("1", "0")
+    val result = StronglyConnectedPatches.scc(graph)
+    assertThat(result).containsExactly(listOf("0", "1"))
+  }
+}
+
+private fun Graph.addEdge(node: Node, dependsOn: Node) {
+  (this as MutableMap).getOrPut(node) { mutableListOf() }.let { (it as MutableList).add(dependsOn) }
+}
+
+private fun Graph.addNode(node: Node) {
+  (this as MutableMap)[node] = mutableListOf()
+}
diff --git a/engine/src/test/java/com/google/android/fhir/sync/upload/request/IndividualGeneratorTest.kt b/engine/src/test/java/com/google/android/fhir/sync/upload/request/IndividualGeneratorTest.kt
index 0e02b6261a..92cded4e1d 100644
--- a/engine/src/test/java/com/google/android/fhir/sync/upload/request/IndividualGeneratorTest.kt
+++ b/engine/src/test/java/com/google/android/fhir/sync/upload/request/IndividualGeneratorTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2023-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 package com.google.android.fhir.sync.upload.request
 
 import com.google.android.fhir.sync.upload.patch.PatchMapping
+import com.google.android.fhir.sync.upload.patch.StronglyConnectedPatchMappings
 import com.google.android.fhir.sync.upload.request.RequestGeneratorTestUtils.deleteLocalChange
 import com.google.android.fhir.sync.upload.request.RequestGeneratorTestUtils.insertionLocalChange
 import com.google.android.fhir.sync.upload.request.RequestGeneratorTestUtils.toPatch
@@ -49,7 +50,7 @@ class IndividualGeneratorTest {
       )
     val requests =
       generator.generateUploadRequests(
-        listOf(patchOutput),
+        listOf(StronglyConnectedPatchMappings(listOf(patchOutput))),
       )
 
     with(requests.single()) {
@@ -72,7 +73,7 @@ class IndividualGeneratorTest {
       )
     val requests =
       generator.generateUploadRequests(
-        listOf(patchOutput),
+        listOf(StronglyConnectedPatchMappings(listOf(patchOutput))),
       )
 
     with(requests.single()) {
@@ -92,7 +93,10 @@ class IndividualGeneratorTest {
         generatedPatch = updateLocalChange.toPatch(),
       )
     val generator = UrlRequestGenerator.Factory.getDefault()
-    val requests = generator.generateUploadRequests(listOf(patchOutput))
+    val requests =
+      generator.generateUploadRequests(
+        listOf(StronglyConnectedPatchMappings(listOf(patchOutput))),
+      )
     with(requests.single()) {
       with(generatedRequest) {
         assertThat(requests.size).isEqualTo(1)
@@ -115,7 +119,10 @@ class IndividualGeneratorTest {
         generatedPatch = deleteLocalChange.toPatch(),
       )
     val generator = UrlRequestGenerator.Factory.getDefault()
-    val requests = generator.generateUploadRequests(listOf(patchOutput))
+    val requests =
+      generator.generateUploadRequests(
+        listOf(StronglyConnectedPatchMappings(listOf(patchOutput))),
+      )
     with(requests.single()) {
       with(generatedRequest) {
         assertThat(httpVerb).isEqualTo(HttpVerb.DELETE)
@@ -132,7 +139,10 @@ class IndividualGeneratorTest {
         PatchMapping(listOf(it), it.toPatch())
       }
     val generator = UrlRequestGenerator.Factory.getDefault()
-    val result = generator.generateUploadRequests(patchOutputList)
+    val result =
+      generator.generateUploadRequests(
+        patchOutputList.map { StronglyConnectedPatchMappings(listOf(it)) },
+      )
     assertThat(result).hasSize(3)
     assertThat(result.map { it.generatedRequest.httpVerb })
       .containsExactly(HttpVerb.PUT, HttpVerb.PATCH, HttpVerb.DELETE)
diff --git a/engine/src/test/java/com/google/android/fhir/sync/upload/request/RequestGeneratorTestUtils.kt b/engine/src/test/java/com/google/android/fhir/sync/upload/request/RequestGeneratorTestUtils.kt
index 6f8bc949dd..b9ea837690 100644
--- a/engine/src/test/java/com/google/android/fhir/sync/upload/request/RequestGeneratorTestUtils.kt
+++ b/engine/src/test/java/com/google/android/fhir/sync/upload/request/RequestGeneratorTestUtils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2023-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ import org.hl7.fhir.r4.model.HumanName
 import org.hl7.fhir.r4.model.Patient
 import org.hl7.fhir.r4.model.ResourceType
 
-object RequestGeneratorTestUtils {
+internal object RequestGeneratorTestUtils {
 
   fun LocalChange.toPatch() =
     Patch(
diff --git a/engine/src/test/java/com/google/android/fhir/sync/upload/request/TransactionBundleGeneratorTest.kt b/engine/src/test/java/com/google/android/fhir/sync/upload/request/TransactionBundleGeneratorTest.kt
index 6319ac0eee..998ffcb4e5 100644
--- a/engine/src/test/java/com/google/android/fhir/sync/upload/request/TransactionBundleGeneratorTest.kt
+++ b/engine/src/test/java/com/google/android/fhir/sync/upload/request/TransactionBundleGeneratorTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2023-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,10 @@
 
 package com.google.android.fhir.sync.upload.request
 
-import ca.uhn.fhir.context.FhirContext
-import ca.uhn.fhir.context.FhirVersionEnum
 import com.google.android.fhir.LocalChange
 import com.google.android.fhir.LocalChangeToken
 import com.google.android.fhir.sync.upload.patch.PatchMapping
+import com.google.android.fhir.sync.upload.patch.StronglyConnectedPatchMappings
 import com.google.android.fhir.sync.upload.request.RequestGeneratorTestUtils.deleteLocalChange
 import com.google.android.fhir.sync.upload.request.RequestGeneratorTestUtils.insertionLocalChange
 import com.google.android.fhir.sync.upload.request.RequestGeneratorTestUtils.toPatch
@@ -50,9 +49,10 @@ class TransactionBundleGeneratorTest {
   fun `generateUploadRequests() should return single Transaction Bundle with 3 entries`() =
     runBlocking {
       val patches =
-        listOf(insertionLocalChange, updateLocalChange, deleteLocalChange).map {
-          PatchMapping(listOf(it), it.toPatch())
-        }
+        listOf(insertionLocalChange, updateLocalChange, deleteLocalChange)
+          .map { PatchMapping(listOf(it), it.toPatch()) }
+          .map { StronglyConnectedPatchMappings(listOf(it)) }
+
       val generator = TransactionBundleGenerator.Factory.getDefault()
       val result = generator.generateUploadRequests(patches)
 
@@ -72,11 +72,10 @@ class TransactionBundleGeneratorTest {
   @Test
   fun `generateUploadRequests() should return 3 Transaction Bundle with single entry each`() =
     runBlocking {
-      val jsonParser = FhirContext.forCached(FhirVersionEnum.R4).newJsonParser()
       val patches =
-        listOf(insertionLocalChange, updateLocalChange, deleteLocalChange).map {
-          PatchMapping(listOf(it), it.toPatch())
-        }
+        listOf(insertionLocalChange, updateLocalChange, deleteLocalChange)
+          .map { PatchMapping(listOf(it), it.toPatch()) }
+          .map { StronglyConnectedPatchMappings(listOf(it)) }
       val generator =
         TransactionBundleGenerator.Factory.getGenerator(
           Bundle.HTTPVerb.PUT,
@@ -119,11 +118,12 @@ class TransactionBundleGeneratorTest {
         )
       val patches =
         listOf(
-          PatchMapping(
-            localChanges = listOf(localChange),
-            generatedPatch = localChange.toPatch(),
-          ),
-        )
+            PatchMapping(
+              localChanges = listOf(localChange),
+              generatedPatch = localChange.toPatch(),
+            ),
+          )
+          .map { StronglyConnectedPatchMappings(listOf(it)) }
       val generator = TransactionBundleGenerator.Factory.getDefault(useETagForUpload = false)
       val result = generator.generateUploadRequests(patches)
 
@@ -147,11 +147,12 @@ class TransactionBundleGeneratorTest {
         )
       val patches =
         listOf(
-          PatchMapping(
-            localChanges = listOf(localChange),
-            generatedPatch = localChange.toPatch(),
-          ),
-        )
+            PatchMapping(
+              localChanges = listOf(localChange),
+              generatedPatch = localChange.toPatch(),
+            ),
+          )
+          .map { StronglyConnectedPatchMappings(listOf(it)) }
       val generator = TransactionBundleGenerator.Factory.getDefault(useETagForUpload = true)
       val result = generator.generateUploadRequests(patches)
 
@@ -185,7 +186,10 @@ class TransactionBundleGeneratorTest {
             token = LocalChangeToken(listOf(2L)),
           ),
         )
-      val patches = localChanges.map { PatchMapping(listOf(it), it.toPatch()) }
+      val patches =
+        localChanges
+          .map { PatchMapping(listOf(it), it.toPatch()) }
+          .map { StronglyConnectedPatchMappings(listOf(it)) }
       val generator = TransactionBundleGenerator.Factory.getDefault(useETagForUpload = true)
       val result = generator.generateUploadRequests(patches)
 
@@ -334,4 +338,146 @@ class TransactionBundleGeneratorTest {
       }
     assertThat(exception.localizedMessage).isEqualTo("Update using PUT is not supported.")
   }
+
+  @Test
+  fun `generate() should not split changes in multiple bundle if combined mapping group has more patches than the permitted size`() =
+    runBlocking {
+      val localChange =
+        LocalChange(
+          resourceType = ResourceType.Patient.name,
+          resourceId = "Patient-00",
+          type = LocalChange.Type.UPDATE,
+          payload = "[]",
+          versionId = "patient-002-version-",
+          timestamp = Instant.now(),
+          token = LocalChangeToken(listOf(1L)),
+        )
+      val patchGroups =
+        List(10) {
+            PatchMapping(
+              localChanges =
+                listOf(
+                  localChange.copy(
+                    resourceId = "Patient-00-$it",
+                    versionId = "patient-002-version-$it",
+                  ),
+                ),
+              generatedPatch = localChange.toPatch(),
+            )
+          }
+          .let { StronglyConnectedPatchMappings(it) }
+      val generator =
+        TransactionBundleGenerator.Factory.getDefault(useETagForUpload = false, bundleSize = 5)
+      val result = generator.generateUploadRequests(listOf(patchGroups))
+
+      assertThat(result).hasSize(1)
+      assertThat(result.single().localChanges.size).isEqualTo(10)
+    }
+
+  @Test
+  fun `generate() should put group mappings in respective bundles`() = runBlocking {
+    val localChange =
+      LocalChange(
+        resourceType = ResourceType.Patient.name,
+        resourceId = "Patient-00",
+        type = LocalChange.Type.UPDATE,
+        payload = "[]",
+        versionId = "patient-002-version-",
+        timestamp = Instant.now(),
+        token = LocalChangeToken(listOf(1L)),
+      )
+
+    val firstGroup =
+      StronglyConnectedPatchMappings(
+        mutableListOf<PatchMapping>().apply {
+          for (i in 1..5) {
+            add(
+              PatchMapping(
+                localChanges =
+                  listOf(
+                    localChange.copy(
+                      resourceId = "Patient-00-$i",
+                      versionId = "patient-002-version-$i",
+                    ),
+                  ),
+                generatedPatch = localChange.toPatch(),
+              ),
+            )
+          }
+        },
+      )
+
+    val secondGroup =
+      StronglyConnectedPatchMappings(
+        listOf(
+          PatchMapping(
+            localChanges =
+              listOf(
+                localChange.copy(resourceId = "Patient-00-6", versionId = "patient-002-version-7"),
+              ),
+            generatedPatch = localChange.toPatch(),
+          ),
+        ),
+      )
+
+    val thirdGroup =
+      StronglyConnectedPatchMappings(
+        listOf(
+          PatchMapping(
+            localChanges =
+              listOf(
+                localChange.copy(resourceId = "Patient-00-7", versionId = "patient-002-version-8"),
+              ),
+            generatedPatch = localChange.toPatch(),
+          ),
+        ),
+      )
+    val fourthGroup =
+      StronglyConnectedPatchMappings(
+        mutableListOf<PatchMapping>().apply {
+          for (i in 9..13) {
+            add(
+              PatchMapping(
+                localChanges =
+                  listOf(
+                    localChange.copy(
+                      resourceId = "Patient-00-$i",
+                      versionId = "patient-002-version-$i",
+                    ),
+                  ),
+                generatedPatch = localChange.toPatch(),
+              ),
+            )
+          }
+        },
+      )
+
+    val patchGroups = listOf(firstGroup, secondGroup, thirdGroup, fourthGroup)
+    val generator =
+      TransactionBundleGenerator.Factory.getDefault(useETagForUpload = false, bundleSize = 5)
+    val result = generator.generateUploadRequests(patchGroups)
+
+    assertThat(result).hasSize(3)
+    assertThat(result[0].localChanges.map { it.resourceId })
+      .containsExactly(
+        "Patient-00-1",
+        "Patient-00-2",
+        "Patient-00-3",
+        "Patient-00-4",
+        "Patient-00-5",
+      )
+      .inOrder()
+    assertThat(result[1].localChanges.map { it.resourceId })
+      .containsExactly("Patient-00-6", "Patient-00-7")
+      .inOrder()
+    assertThat(result[2].localChanges.map { it.resourceId })
+      .containsExactly(
+        "Patient-00-9",
+        "Patient-00-10",
+        "Patient-00-11",
+        "Patient-00-12",
+        "Patient-00-13",
+      )
+      .inOrder()
+  }
 }
diff --git a/mkdocs.yaml b/mkdocs.yaml
index ea6ca45351..0ecd127b5a 100644
--- a/mkdocs.yaml
+++ b/mkdocs.yaml
@@ -42,6 +42,7 @@ nav:
               - use/WFL/Compile-and-Execute-CQL.md
       - use/Extensions.md
       - API Doc: use/api.md
+      - Use Snapshots: use/Snapshots.md
   - Contributors:
       - Contributing: contrib/index.md
       - Codespaces: contrib/codespaces.md
diff --git a/settings.gradle.kts b/settings.gradle.kts
index e730ebe50b..bc56f5a9cc 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -3,7 +3,7 @@ import androidx.build.gradle.gcpbuildcache.GcpBuildCacheServiceFactory
 
 plugins {
   id("com.gradle.enterprise") version ("3.10")
-  id("androidx.build.gradle.gcpbuildcache") version "1.0.0-beta05"
+  id("androidx.build.gradle.gcpbuildcache") version "1.0.0-beta07"
   id("org.gradle.toolchains.foojay-resolver-convention") version ("0.5.0")
 }