diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ba87ece5..a5a6285b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -23,7 +23,7 @@ reported the issue. Please try to include as much information as you can. Detail
 ## Contributing via Pull Requests
 Contributions via pull requests are much appreciated. Before sending us a pull request, please ensure that:
 
-1. You are working against the latest source on the *master* branch.
+1. You are working against the latest source on the *main* branch.
 2. You check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already.
 3. You open an issue to discuss any significant work - we would hate for your time to be wasted.
 
@@ -56,6 +56,6 @@ If you discover a potential security issue in this project we ask that you notif
 
 ## Licensing
 
-See the [LICENSE](https://github.com/aws-cloudformation/rain/blob/master/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
+See the [LICENSE](https://github.com/aws-cloudformation/rain/blob/main/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
 
 We may ask you to sign a [Contributor License Agreement (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes.
diff --git a/cft/format/transform.go b/cft/format/transform.go
index 4907e45f..667ea69d 100644
--- a/cft/format/transform.go
+++ b/cft/format/transform.go
@@ -11,7 +11,7 @@ import (
 // Global, set by command arg --node-style
 var NodeStyle string
 
-var NodeStyleDocs = "Set the node output style to tagged, doublequoted, singlequoted, literal, folded, quotescalars, original, or flow"
+var NodeStyleDocs = "Set the node output style to tagged, doublequoted, singlequoted, literal, folded, strict-boolean, quotescalars, original, or flow"
 
 func mergeComments(comments []string) string {
 	out := strings.Builder{}
diff --git a/docs/index.md b/docs/index.md
index 95a11d3a..d9563725 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -36,4 +36,4 @@ Rain is a command line tool for working with AWS CloudFormation templates and st
 * [rain tree](rain_tree.md)	 - Find dependencies of Resources and Outputs in a local template
 * [rain watch](rain_watch.md)	 - Display an updating view of a CloudFormation stack
 
-###### Auto generated by spf13/cobra on 3-Apr-2025
+###### Auto generated by spf13/cobra on 7-Apr-2025
diff --git a/docs/rain_bootstrap.md b/docs/rain_bootstrap.md
index 3ae7154a..c24646b6 100644
--- a/docs/rain_bootstrap.md
+++ b/docs/rain_bootstrap.md
@@ -33,4 +33,4 @@ rain bootstrap
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 3-Apr-2025
+###### Auto generated by spf13/cobra on 7-Apr-2025
diff --git a/docs/rain_build.md b/docs/rain_build.md
index 4b89b4f1..42e4d3d3 100644
--- a/docs/rain_build.md
+++ b/docs/rain_build.md
@@ -42,4 +42,4 @@ rain build [<resource type>] or <prompt>
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 3-Apr-2025
+###### Auto generated by spf13/cobra on 7-Apr-2025
diff --git a/docs/rain_cat.md b/docs/rain_cat.md
index f1772e2a..71601b85 100644
--- a/docs/rain_cat.md
+++ b/docs/rain_cat.md
@@ -35,4 +35,4 @@ rain cat <stack>
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 3-Apr-2025
+###### Auto generated by spf13/cobra on 7-Apr-2025
diff --git a/docs/rain_cc.md b/docs/rain_cc.md
index 1381310f..8efc1ec3 100644
--- a/docs/rain_cc.md
+++ b/docs/rain_cc.md
@@ -33,4 +33,4 @@ You must pass the --experimental (-x) flag to use this command, to acknowledge t
 * [rain cc rm](rain_cc_rm.md)	 - Delete a deployment created by cc deploy (Experimental!)
 * [rain cc state](rain_cc_state.md)	 - Download the state file for a template deployed with cc deploy
 
-###### Auto generated by spf13/cobra on 3-Apr-2025
+###### Auto generated by spf13/cobra on 7-Apr-2025
diff --git a/docs/rain_cc_deploy.md b/docs/rain_cc_deploy.md
index 4be76a8a..21bdaef0 100644
--- a/docs/rain_cc_deploy.md
+++ b/docs/rain_cc_deploy.md
@@ -40,4 +40,4 @@ rain cc deploy <template> <name>
 
 * [rain cc](rain_cc.md)	 - Interact with templates using Cloud Control API instead of CloudFormation
 
-###### Auto generated by spf13/cobra on 3-Apr-2025
+###### Auto generated by spf13/cobra on 7-Apr-2025
diff --git a/docs/rain_cc_drift.md b/docs/rain_cc_drift.md
index e04a74f0..abed5bf0 100644
--- a/docs/rain_cc_drift.md
+++ b/docs/rain_cc_drift.md
@@ -33,4 +33,4 @@ rain cc drift <name>
 
 * [rain cc](rain_cc.md)	 - Interact with templates using Cloud Control API instead of CloudFormation
 
-###### Auto generated by spf13/cobra on 3-Apr-2025
+###### Auto generated by spf13/cobra on 7-Apr-2025
diff --git a/docs/rain_cc_rm.md b/docs/rain_cc_rm.md
index 5be451d8..67db41ac 100644
--- a/docs/rain_cc_rm.md
+++ b/docs/rain_cc_rm.md
@@ -33,4 +33,4 @@ rain cc rm <name>
 
 * [rain cc](rain_cc.md)	 - Interact with templates using Cloud Control API instead of CloudFormation
 
-###### Auto generated by spf13/cobra on 3-Apr-2025
+###### Auto generated by spf13/cobra on 7-Apr-2025
diff --git a/docs/rain_cc_state.md b/docs/rain_cc_state.md
index fc337a39..38192e78 100644
--- a/docs/rain_cc_state.md
+++ b/docs/rain_cc_state.md
@@ -33,4 +33,4 @@ rain cc state <name>
 
 * [rain cc](rain_cc.md)	 - Interact with templates using Cloud Control API instead of CloudFormation
 
-###### Auto generated by spf13/cobra on 3-Apr-2025
+###### Auto generated by spf13/cobra on 7-Apr-2025
diff --git a/docs/rain_console.md b/docs/rain_console.md
index 318011f1..34e19c39 100644
--- a/docs/rain_console.md
+++ b/docs/rain_console.md
@@ -39,4 +39,4 @@ rain console [stack]
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 3-Apr-2025
+###### Auto generated by spf13/cobra on 7-Apr-2025
diff --git a/docs/rain_deploy.md b/docs/rain_deploy.md
index a0f22c14..4f317930 100644
--- a/docs/rain_deploy.md
+++ b/docs/rain_deploy.md
@@ -64,7 +64,7 @@ rain deploy <template> [stack]
       --nested-change-set        Whether or not to include nested stacks in the change set (default true)
       --no-analytics             Do not write analytics to Metadata
   -x, --no-exec                  do not execute the changeset
-      --node-style string        Set the node output style to tagged, doublequoted, singlequoted, literal, folded, quotescalars, original, or flow (default "original")
+      --node-style string        Set the node output style to tagged, doublequoted, singlequoted, literal, folded, strict-boolean, quotescalars, original, or flow (default "original")
       --params strings           set parameter values; use the format key1=value1,key2=value2
   -p, --profile string           AWS profile name; read from the AWS CLI configuration file
   -r, --region string            AWS region to use
@@ -88,4 +88,4 @@ rain deploy <template> [stack]
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 3-Apr-2025
+###### Auto generated by spf13/cobra on 7-Apr-2025
diff --git a/docs/rain_diff.md b/docs/rain_diff.md
index 1f648032..1420c49e 100644
--- a/docs/rain_diff.md
+++ b/docs/rain_diff.md
@@ -28,4 +28,4 @@ rain diff <from> <to>
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 3-Apr-2025
+###### Auto generated by spf13/cobra on 7-Apr-2025
diff --git a/docs/rain_fmt.md b/docs/rain_fmt.md
index 649dffb6..937506eb 100644
--- a/docs/rain_fmt.md
+++ b/docs/rain_fmt.md
@@ -17,7 +17,7 @@ rain fmt <filename>...
       --debug                Output debugging information
   -h, --help                 help for fmt
   -j, --json                 Output the template as JSON (default format: YAML).
-      --node-style string    Set the node output style to tagged, doublequoted, singlequoted, literal, folded, quotescalars, original, or flow
+      --node-style string    Set the node output style to tagged, doublequoted, singlequoted, literal, folded, strict-boolean, quotescalars, original, or flow
   -p, --pkl                  Output the template as Pkl (default format: YAML).
       --pkl-basic            Don't use Pkl modules for output
       --pkl-package string   An alias or full package URI for the Pkl package for generated Pkl files (default "@cfn")
@@ -38,4 +38,4 @@ rain fmt <filename>...
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 3-Apr-2025
+###### Auto generated by spf13/cobra on 7-Apr-2025
diff --git a/docs/rain_forecast.md b/docs/rain_forecast.md
index d6e65612..381a8408 100644
--- a/docs/rain_forecast.md
+++ b/docs/rain_forecast.md
@@ -55,4 +55,4 @@ rain forecast --experimental <template> [stackName]
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 3-Apr-2025
+###### Auto generated by spf13/cobra on 7-Apr-2025
diff --git a/docs/rain_info.md b/docs/rain_info.md
index ec4d0a8e..d1989b7b 100644
--- a/docs/rain_info.md
+++ b/docs/rain_info.md
@@ -30,4 +30,4 @@ rain info
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 3-Apr-2025
+###### Auto generated by spf13/cobra on 7-Apr-2025
diff --git a/docs/rain_logs.md b/docs/rain_logs.md
index fd5b7fe5..56eb1199 100644
--- a/docs/rain_logs.md
+++ b/docs/rain_logs.md
@@ -37,4 +37,4 @@ rain logs <stack> (<resource>)
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 3-Apr-2025
+###### Auto generated by spf13/cobra on 7-Apr-2025
diff --git a/docs/rain_ls.md b/docs/rain_ls.md
index a23ffc10..bafd5500 100644
--- a/docs/rain_ls.md
+++ b/docs/rain_ls.md
@@ -31,4 +31,4 @@ rain ls <stack> [changeset]
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 3-Apr-2025
+###### Auto generated by spf13/cobra on 7-Apr-2025
diff --git a/docs/rain_merge.md b/docs/rain_merge.md
index 26c29742..47b7e853 100644
--- a/docs/rain_merge.md
+++ b/docs/rain_merge.md
@@ -16,7 +16,7 @@ rain merge <template> <template> ...
   -f, --force               Don't warn on clashing attributes; rename them instead. Note: this will not rename Refs, GetAtts, etc.
   -h, --help                help for merge
       --merge-imports       Convert imported output values into GetAtts
-      --node-style string   Set the node output style to tagged, doublequoted, singlequoted, literal, folded, quotescalars, original, or flow
+      --node-style string   Set the node output style to tagged, doublequoted, singlequoted, literal, folded, strict-boolean, quotescalars, original, or flow
   -o, --output string       Output merged template to a file
 ```
 
@@ -31,4 +31,4 @@ rain merge <template> <template> ...
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 3-Apr-2025
+###### Auto generated by spf13/cobra on 7-Apr-2025
diff --git a/docs/rain_module.md b/docs/rain_module.md
index 2faf6ce8..0f9a316a 100644
--- a/docs/rain_module.md
+++ b/docs/rain_module.md
@@ -31,4 +31,4 @@ The rain module command can be used to publish modules to CodeArtifact, and to i
 * [rain module install](rain_module_install.md)	 - Install a package of Rain modules from CodeArtifact
 * [rain module publish](rain_module_publish.md)	 - Publish a directory of Rain modules to CodeArtifact
 
-###### Auto generated by spf13/cobra on 3-Apr-2025
+###### Auto generated by spf13/cobra on 7-Apr-2025
diff --git a/docs/rain_module_bootstrap.md b/docs/rain_module_bootstrap.md
index bf1e69c3..33b2ac89 100644
--- a/docs/rain_module_bootstrap.md
+++ b/docs/rain_module_bootstrap.md
@@ -29,4 +29,4 @@ rain module bootstrap [flags]
 
 * [rain module](rain_module.md)	 - Interact with Rain modules in CodeArtifact
 
-###### Auto generated by spf13/cobra on 3-Apr-2025
+###### Auto generated by spf13/cobra on 7-Apr-2025
diff --git a/docs/rain_module_install.md b/docs/rain_module_install.md
index 06dd6ae1..f6916c9d 100644
--- a/docs/rain_module_install.md
+++ b/docs/rain_module_install.md
@@ -30,4 +30,4 @@ rain module install <name> [flags]
 
 * [rain module](rain_module.md)	 - Interact with Rain modules in CodeArtifact
 
-###### Auto generated by spf13/cobra on 3-Apr-2025
+###### Auto generated by spf13/cobra on 7-Apr-2025
diff --git a/docs/rain_module_publish.md b/docs/rain_module_publish.md
index cdb6b117..06510dba 100644
--- a/docs/rain_module_publish.md
+++ b/docs/rain_module_publish.md
@@ -30,4 +30,4 @@ rain module publish <name> [flags]
 
 * [rain module](rain_module.md)	 - Interact with Rain modules in CodeArtifact
 
-###### Auto generated by spf13/cobra on 3-Apr-2025
+###### Auto generated by spf13/cobra on 7-Apr-2025
diff --git a/docs/rain_pkg.md b/docs/rain_pkg.md
index 973e4414..bcffc852 100644
--- a/docs/rain_pkg.md
+++ b/docs/rain_pkg.md
@@ -51,7 +51,7 @@ rain pkg <template>
   -x, --experimental        Enable experimental features
   -h, --help                help for pkg
       --no-analytics        Do not include analytics in Metadata
-      --node-style string   Set the node output style to tagged, doublequoted, singlequoted, literal, folded, quotescalars, original, or flow
+      --node-style string   Set the node output style to tagged, doublequoted, singlequoted, literal, folded, strict-boolean, quotescalars, original, or flow
   -o, --output string       Output packaged template to a file
   -p, --profile string      AWS profile name; read from the AWS CLI configuration file
   -r, --region string       AWS region to use
@@ -70,4 +70,4 @@ rain pkg <template>
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 3-Apr-2025
+###### Auto generated by spf13/cobra on 7-Apr-2025
diff --git a/docs/rain_rm.md b/docs/rain_rm.md
index f6ed9b4d..ad915687 100644
--- a/docs/rain_rm.md
+++ b/docs/rain_rm.md
@@ -34,4 +34,4 @@ rain rm <stack> [changeset]
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 3-Apr-2025
+###### Auto generated by spf13/cobra on 7-Apr-2025
diff --git a/docs/rain_stackset.md b/docs/rain_stackset.md
index 92496394..08d07729 100644
--- a/docs/rain_stackset.md
+++ b/docs/rain_stackset.md
@@ -28,4 +28,4 @@ This command manipulates stack sets. It has no action if specific stack set comm
 * [rain stackset ls](rain_stackset_ls.md)	 - List a CloudFormation stack sets in a given region
 * [rain stackset rm](rain_stackset_rm.md)	 - Delete a CloudFormation stack set and/or its instances.
 
-###### Auto generated by spf13/cobra on 3-Apr-2025
+###### Auto generated by spf13/cobra on 7-Apr-2025
diff --git a/docs/rain_stackset_deploy.md b/docs/rain_stackset_deploy.md
index 66947f4a..00ebb520 100644
--- a/docs/rain_stackset_deploy.md
+++ b/docs/rain_stackset_deploy.md
@@ -70,4 +70,4 @@ rain stackset deploy <template> [stackset] [flags]
 
 * [rain stackset](rain_stackset.md)	 - This command manipulates stack sets.
 
-###### Auto generated by spf13/cobra on 3-Apr-2025
+###### Auto generated by spf13/cobra on 7-Apr-2025
diff --git a/docs/rain_stackset_ls.md b/docs/rain_stackset_ls.md
index ed34c1b0..e1c4d1b2 100644
--- a/docs/rain_stackset_ls.md
+++ b/docs/rain_stackset_ls.md
@@ -31,4 +31,4 @@ rain stackset ls <stack set>
 
 * [rain stackset](rain_stackset.md)	 - This command manipulates stack sets.
 
-###### Auto generated by spf13/cobra on 3-Apr-2025
+###### Auto generated by spf13/cobra on 7-Apr-2025
diff --git a/docs/rain_stackset_rm.md b/docs/rain_stackset_rm.md
index 1a8693cf..7726b2d8 100644
--- a/docs/rain_stackset_rm.md
+++ b/docs/rain_stackset_rm.md
@@ -31,4 +31,4 @@ rain stackset rm <stackset>
 
 * [rain stackset](rain_stackset.md)	 - This command manipulates stack sets.
 
-###### Auto generated by spf13/cobra on 3-Apr-2025
+###### Auto generated by spf13/cobra on 7-Apr-2025
diff --git a/docs/rain_tree.md b/docs/rain_tree.md
index ca506014..49dd8169 100644
--- a/docs/rain_tree.md
+++ b/docs/rain_tree.md
@@ -30,4 +30,4 @@ rain tree [template]
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 3-Apr-2025
+###### Auto generated by spf13/cobra on 7-Apr-2025
diff --git a/docs/rain_watch.md b/docs/rain_watch.md
index bd7687aa..56510994 100644
--- a/docs/rain_watch.md
+++ b/docs/rain_watch.md
@@ -30,4 +30,4 @@ rain watch <stack>
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 3-Apr-2025
+###### Auto generated by spf13/cobra on 7-Apr-2025