20.30.1 (2024-11-26) Bug Fixes Coalesce local resolve_conflicts_on_create_default value to a boolean since default is null (#3221) (35388bb)