diff --git a/compose-lint-checks/lint-baseline.xml b/compose-lint-checks/lint-baseline.xml
index 93e250c5..3524de72 100644
--- a/compose-lint-checks/lint-baseline.xml
+++ b/compose-lint-checks/lint-baseline.xml
@@ -1,14 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 7.4.0" type="baseline" client="gradle" dependencies="false" name="AGP (7.4.0)" variant="all" version="7.4.0">
+<issues format="6" by="lint 7.4.1" type="baseline" client="gradle" dependencies="false" name="AGP (7.4.1)" variant="all" version="7.4.1">
 
     <issue
         id="LintImplTextFormat"
         message="Multi-line issue explanation strings will interpret line separators as hard breaks, and this looks like a continuation of the same paragraph. Consider using \ at the end of the previous line to indicate that the lines should be joined, or add a blank line between unrelated sentences, or suppress this issue type here."
-        errorLine1="              `CompositionLocals` should be named using the `Local` prefix as an adjective, followed by a descriptive noun."
-        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="              Composable functions that return Unit should start with an uppercase letter."
+        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/slack/lint/compose/ComposeCompositionLocalNamingDetector.kt"
-            line="40"
+            file="src/main/java/slack/lint/compose/ComposableFunctionNamingDetector.kt"
+            line="41"
+            column="15"/>
+    </issue>
+
+    <issue
+        id="LintImplTextFormat"
+        message="Multi-line issue explanation strings will interpret line separators as hard breaks, and this looks like a continuation of the same paragraph. Consider using \ at the end of the previous line to indicate that the lines should be joined, or add a blank line between unrelated sentences, or suppress this issue type here."
+        errorLine1="              Composable functions that return a value should start with a lowercase letter."
+        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/slack/lint/compose/ComposableFunctionNamingDetector.kt"
+            line="58"
             column="15"/>
     </issue>
 
@@ -18,8 +29,8 @@
         errorLine1="              `CompositionLocal`s are implicit dependencies and creating new ones should be avoided."
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/slack/lint/compose/ComposeCompositionLocalUsageDetector.kt"
-            line="40"
+            file="src/main/java/slack/lint/compose/CompositionLocalUsageDetector.kt"
+            line="41"
             column="15"/>
     </issue>
 
@@ -29,19 +40,41 @@
         errorLine1="            Composable functions should either emit content into the composition or return a value, but not both."
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/slack/lint/compose/ComposeContentEmitterReturningValuesDetector.kt"
-            line="42"
+            file="src/main/java/slack/lint/compose/ContentEmitterReturningValuesDetector.kt"
+            line="43"
             column="13"/>
     </issue>
 
+    <issue
+        id="LintImplTextFormat"
+        message="The issue summary should be shorter; typically just a 3-6 words; it&apos;s used as a topic header in HTML reports and in the IDE inspections window"
+        errorLine1="        briefDescription = &quot;Using @Composable builder functions for modifiers is not recommended&quot;,"
+        errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/slack/lint/compose/ModifierComposableDetector.kt"
+            line="22"
+            column="29"/>
+    </issue>
+
+    <issue
+        id="LintImplTextFormat"
+        message="Multi-line issue explanation strings will interpret line separators as hard breaks, and this looks like a continuation of the same paragraph. Consider using \ at the end of the previous line to indicate that the lines should be joined, or add a blank line between unrelated sentences, or suppress this issue type here."
+        errorLine1="          Using @Composable builder functions for modifiers is not recommended, as they cause unnecessary recompositions."
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/slack/lint/compose/ModifierComposableDetector.kt"
+            line="25"
+            column="11"/>
+    </issue>
+
     <issue
         id="LintImplTextFormat"
         message="Multi-line issue explanation strings will interpret line separators as hard breaks, and this looks like a continuation of the same paragraph. Consider using \ at the end of the previous line to indicate that the lines should be joined, or add a blank line between unrelated sentences, or suppress this issue type here."
         errorLine1="              This @Composable function emits content but doesn&apos;t have a modifier parameter."
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/slack/lint/compose/ComposeModifierMissingDetector.kt"
-            line="39"
+            file="src/main/java/slack/lint/compose/ModifierMissingDetector.kt"
+            line="40"
             column="15"/>
     </issue>
 
@@ -51,8 +84,8 @@
         errorLine1="              Modifiers should only be used once and by the root level layout of a Composable. This is true even if appended to or with other modifiers e.g. `modifier.fillMaxWidth()`."
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/slack/lint/compose/ComposeModifierReusedDetector.kt"
-            line="44"
+            file="src/main/java/slack/lint/compose/ModifierReusedDetector.kt"
+            line="45"
             column="15"/>
     </issue>
 
@@ -62,8 +95,8 @@
         errorLine1="              This @Composable function has a modifier parameter but it doesn&apos;t have a default value."
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/slack/lint/compose/ComposeModifierWithoutDefaultDetector.kt"
-            line="31"
+            file="src/main/java/slack/lint/compose/ModifierWithoutDefaultDetector.kt"
+            line="32"
             column="15"/>
     </issue>
 
@@ -73,8 +106,8 @@
         errorLine1="              Composable functions should only be emitting content into the composition from one source at their top level."
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/slack/lint/compose/ComposeMultipleContentEmittersDetector.kt"
-            line="42"
+            file="src/main/java/slack/lint/compose/MultipleContentEmittersDetector.kt"
+            line="43"
             column="15"/>
     </issue>
 
@@ -84,42 +117,53 @@
         errorLine1="              Using mutable objects as state in Compose will cause your users to see incorrect or stale data in your app."
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/slack/lint/compose/ComposeMutableParametersDetector.kt"
-            line="24"
+            file="src/main/java/slack/lint/compose/MutableParametersDetector.kt"
+            line="25"
             column="15"/>
     </issue>
 
     <issue
         id="LintImplTextFormat"
         message="Multi-line issue explanation strings will interpret line separators as hard breaks, and this looks like a continuation of the same paragraph. Consider using \ at the end of the previous line to indicate that the lines should be joined, or add a blank line between unrelated sentences, or suppress this issue type here."
-        errorLine1="              Composable functions that return Unit should start with an uppercase letter."
-        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="              Composables annotated with `@Preview` that are used only for previewing the UI should not be public."
+        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/slack/lint/compose/ComposeNamingDetector.kt"
-            line="40"
+            file="src/main/java/slack/lint/compose/PreviewPublicDetector.kt"
+            line="47"
             column="15"/>
     </issue>
 
     <issue
         id="LintImplTextFormat"
-        message="Multi-line issue explanation strings will interpret line separators as hard breaks, and this looks like a continuation of the same paragraph. Consider using \ at the end of the previous line to indicate that the lines should be joined, or add a blank line between unrelated sentences, or suppress this issue type here."
-        errorLine1="              Composable functions that return a value should start with a lowercase letter."
-        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="The issue summary should be shorter; typically just a 3-6 words; it&apos;s used as a topic header in HTML reports and in the IDE inspections window"
+        errorLine1="          &quot;Forwarding a ViewModel through multiple @Composable functions should be avoided&quot;,"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/slack/lint/compose/ComposeNamingDetector.kt"
-            line="57"
-            column="15"/>
+            file="src/main/java/slack/lint/compose/ViewModelForwardingDetector.kt"
+            line="30"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="LintImplTextFormat"
+        message="&quot;ViewModel&quot; looks like a code reference; surround with backtics in string to display as symbol, e.g. \`ViewModel\`"
+        errorLine1="          Forwarding a ViewModel through multiple @Composable functions should be avoided. Consider using state hoisting."
+        errorLine2="                       ~~~~~~~~~">
+        <location
+            file="src/main/java/slack/lint/compose/ViewModelForwardingDetector.kt"
+            line="33"
+            column="24"/>
     </issue>
 
     <issue
         id="LintImplTextFormat"
         message="Multi-line issue explanation strings will interpret line separators as hard breaks, and this looks like a continuation of the same paragraph. Consider using \ at the end of the previous line to indicate that the lines should be joined, or add a blank line between unrelated sentences, or suppress this issue type here."
-        errorLine1="              Composables annotated with `@Preview` that are used only for previewing the UI should not be public."
-        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="          Forwarding a ViewModel through multiple @Composable functions should be avoided. Consider using state hoisting."
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/slack/lint/compose/ComposePreviewPublicDetector.kt"
-            line="46"
-            column="15"/>
+            file="src/main/java/slack/lint/compose/ViewModelForwardingDetector.kt"
+            line="33"
+            column="11"/>
     </issue>
 
 </issues>