diff --git a/MIGRATION_GUIDE.md b/MIGRATION_GUIDE.md
index 005f3992ed..1b05e256d8 100644
--- a/MIGRATION_GUIDE.md
+++ b/MIGRATION_GUIDE.md
@@ -52,61 +52,101 @@ We added non-negative validations for the following parameters:
 
 Note that enum parameters are still not validated by the provider - they are only validated in Snowflake. We will handle this during a small rework of the parameters in the future.
 
+### Add missing preview features to config
+
+Values:
+- `snowflake_functions_datasource`
+- `snowflake_procedures_datasource`
+- `snowflake_tables_datasource`
+  were missing in the `preview_features_enabled` attribute in the provider's config. They were added.
+
+References: #3302
+
+### functions and procedures docs updated
+
+Argument names are automatically wrapped in double quotes, so:
+- uppercase names should be used or
+- argument name should be quoted in the procedure/function definition.
+
+Updated the docs and the previous migration guide entry.
+
+References: #3298
+
+### python procedure docs updated
+
+Importing python procedure is currently limited to procedures with snowflake-snowpark-python version explicitly set in Snowflake. Docs were updated.
+
+References: #3303
+
 ## v0.100.0 ➞ v1.0.0
 
 ### Preview features flag
 All of the preview features objects are now disabled by default. This includes:
 - Resources
-	- `snowflake_account_password_policy_attachment`
-	- `snowflake_alert`
-	- `snowflake_api_integration`
-	- `snowflake_cortex_search_service`
-	- `snowflake_dynamic_table`
-	- `snowflake_external_function`
-	- `snowflake_external_table`
-	- `snowflake_external_volume`
-	- `snowflake_failover_group`
-	- `snowflake_file_format`
-	- `snowflake_managed_account`
-	- `snowflake_materialized_view`
-	- `snowflake_network_policy_attachment`
-	- `snowflake_network_rule`
-	- `snowflake_email_notification_integration`
-	- `snowflake_notification_integration`
-	- `snowflake_object_parameter`
-	- `snowflake_password_policy`
-	- `snowflake_pipe`
-	- `snowflake_sequence`
-	- `snowflake_share`
-	- `snowflake_stage`
-	- `snowflake_storage_integration`
-	- `snowflake_table_column_masking_policy_application`
-	- `snowflake_table_constraint`
-	- `snowflake_user_public_keys`
-	- `snowflake_user_password_policy_attachment`
+  - `snowflake_account_password_policy_attachment`
+  - `snowflake_alert`
+  - `snowflake_api_integration`
+  - `snowflake_cortex_search_service`
+  - `snowflake_dynamic_table`
+  - `snowflake_external_function`
+  - `snowflake_external_table`
+  - `snowflake_external_volume`
+  - `snowflake_failover_group`
+  - `snowflake_file_format`
+  - `snowflake_function_java`
+  - `snowflake_function_javascript`
+  - `snowflake_function_python`
+  - `snowflake_function_scala`
+  - `snowflake_function_sql`
+  - `snowflake_managed_account`
+  - `snowflake_materialized_view`
+  - `snowflake_network_policy_attachment`
+  - `snowflake_network_rule`
+  - `snowflake_email_notification_integration`
+  - `snowflake_notification_integration`
+  - `snowflake_object_parameter`
+  - `snowflake_password_policy`
+  - `snowflake_pipe`
+  - `snowflake_procedure_java`
+  - `snowflake_procedure_javascript`
+  - `snowflake_procedure_python`
+  - `snowflake_procedure_scala`
+  - `snowflake_procedure_sql`
+  - `snowflake_sequence`
+  - `snowflake_share`
+  - `snowflake_stage`
+  - `snowflake_storage_integration`
+  - `snowflake_table`
+  - `snowflake_table_column_masking_policy_application`
+  - `snowflake_table_constraint`
+  - `snowflake_user_public_keys`
+  - `snowflake_user_password_policy_attachment`
 - Data sources
-	- `snowflake_current_account`
-	- `snowflake_alerts`
-	- `snowflake_cortex_search_services`
-	- `snowflake_database`
-	- `snowflake_database_role`
-	- `snowflake_dynamic_tables`
-	- `snowflake_external_functions`
-	- `snowflake_external_tables`
-	- `snowflake_failover_groups`
-	- `snowflake_file_formats`
-	- `snowflake_materialized_views`
-	- `snowflake_pipes`
-	- `snowflake_current_role`
-	- `snowflake_sequences`
-	- `snowflake_shares`
-	- `snowflake_parameters`
-	- `snowflake_stages`
-	- `snowflake_storage_integrations`
-	- `snowflake_system_generate_scim_access_token`
-	- `snowflake_system_get_aws_sns_iam_policy`
-	- `snowflake_system_get_privatelink_config`
-	- `snowflake_system_get_snowflake_platform_info`
+  - `snowflake_current_account`
+  - `snowflake_alerts`
+  - `snowflake_cortex_search_services`
+  - `snowflake_database`
+  - `snowflake_database_role`
+  - `snowflake_dynamic_tables`
+  - `snowflake_external_functions`
+  - `snowflake_external_tables`
+  - `snowflake_failover_groups`
+  - `snowflake_file_formats`
+  - `snowflake_functions`
+  - `snowflake_materialized_views`
+  - `snowflake_pipes`
+  - `snowflake_procedures`
+  - `snowflake_current_role`
+  - `snowflake_sequences`
+  - `snowflake_shares`
+  - `snowflake_parameters`
+  - `snowflake_stages`
+  - `snowflake_storage_integrations`
+  - `snowflake_system_generate_scim_access_token`
+  - `snowflake_system_get_aws_sns_iam_policy`
+  - `snowflake_system_get_privatelink_config`
+  - `snowflake_system_get_snowflake_platform_info`
+  - `snowflake_tables`
 
 If you want to have them enabled, add the feature name to the provider configuration (with `_datasource` or `_resource` suffix), like this:
 ```terraform
@@ -170,6 +210,8 @@ The new resources are more aligned with current features like:
 - secrets support
 - argument default values
 
+**Note**: argument names are now quoted automatically by the provider so remember about this while writing the function definition (argument name should be quoted or uppercase should be used for the argument name).
+
 `snowflake_procedure` is now deprecated in favor of 5 new preview resources:
 
 - `snowflake_procedure_java`
@@ -186,6 +228,8 @@ The new resources are more aligned with current features like:
 - secrets support
 - argument default values
 
+**Note**: argument names are now quoted automatically by the provider so remember about this while writing the procedure definition (argument name should be quoted or uppercase should be used for the argument name).
+
 ### *(new feature)* Account role data source
 Added a new `snowflake_account_roles` data source for account roles. Now it reflects It's based on `snowflake_roles` data source.
 `account_roles` field now organizes output of show under `show_output` field.
diff --git a/docs/resources/function_java.md b/docs/resources/function_java.md
index 5570e2575e..2ad592c726 100644
--- a/docs/resources/function_java.md
+++ b/docs/resources/function_java.md
@@ -40,7 +40,13 @@ resource "snowflake_function_java" "w" {
   }
   return_type         = "VARCHAR(100)"
   handler             = "TestFunc.echoVarchar"
-  function_definition = "\n\tclass TestFunc {\n\t\tpublic static String echoVarchar(String x) {\n\t\t\treturn x;\n\t\t}\n\t}\n"
+  function_definition = <<EOT
+  class TestFunc {
+    public static String echoVarchar(String x) {
+      return x;
+    }
+  }
+EOT
 }
 ```
 -> **Note** Instead of using fully_qualified_name, you can reference objects managed outside Terraform by constructing a correct ID, consult [identifiers guide](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/guides/identifiers#new-computed-fully-qualified-name-field-in-resources).
@@ -90,7 +96,7 @@ resource "snowflake_function_java" "w" {
 Required:
 
 - `arg_data_type` (String) The argument type.
-- `arg_name` (String) The argument name.
+- `arg_name` (String) The argument name. The provider wraps it in double quotes by default, so be aware of that while referencing the argument in the function definition.
 
 Optional:
 
diff --git a/docs/resources/function_javascript.md b/docs/resources/function_javascript.md
index 9333693081..c587e4b9a9 100644
--- a/docs/resources/function_javascript.md
+++ b/docs/resources/function_javascript.md
@@ -39,10 +39,14 @@ resource "snowflake_function_javascript" "minimal" {
     arg_data_type = "VARIANT"
     arg_name      = "x"
   }
-  function_definition = <<EOF
-    return x;
-  EOF
   return_type         = "VARIANT"
+  function_definition = <<EOT
+  if (x == 0) {
+    return 1;
+  } else {
+    return 2;
+  }
+EOT
 }
 ```
 -> **Note** Instead of using fully_qualified_name, you can reference objects managed outside Terraform by constructing a correct ID, consult [identifiers guide](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/guides/identifiers#new-computed-fully-qualified-name-field-in-resources).
@@ -85,7 +89,7 @@ resource "snowflake_function_javascript" "minimal" {
 Required:
 
 - `arg_data_type` (String) The argument type.
-- `arg_name` (String) The argument name.
+- `arg_name` (String) The argument name. The provider wraps it in double quotes by default, so be aware of that while referencing the argument in the function definition.
 
 Optional:
 
diff --git a/docs/resources/function_python.md b/docs/resources/function_python.md
index a2cf487db5..249a4d8ebc 100644
--- a/docs/resources/function_python.md
+++ b/docs/resources/function_python.md
@@ -42,12 +42,15 @@ resource "snowflake_function_python" "minimal" {
     arg_data_type = "NUMBER(36, 2)"
     arg_name      = "x"
   }
-  function_definition = <<EOF
-    def some_function(x):
-      return x
-  EOF
-  handler             = "some_function"
   return_type         = "NUMBER(36, 2)"
+  handler             = "some_function"
+  function_definition = <<EOT
+def some_function(x):
+  result = ''
+  for a in range(5):
+    result += x
+  return result
+EOT
 }
 ```
 -> **Note** Instead of using fully_qualified_name, you can reference objects managed outside Terraform by constructing a correct ID, consult [identifiers guide](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/guides/identifiers#new-computed-fully-qualified-name-field-in-resources).
@@ -97,7 +100,7 @@ resource "snowflake_function_python" "minimal" {
 Required:
 
 - `arg_data_type` (String) The argument type.
-- `arg_name` (String) The argument name.
+- `arg_name` (String) The argument name. The provider wraps it in double quotes by default, so be aware of that while referencing the argument in the function definition.
 
 Optional:
 
diff --git a/docs/resources/function_scala.md b/docs/resources/function_scala.md
index 9a03c90548..9cea381089 100644
--- a/docs/resources/function_scala.md
+++ b/docs/resources/function_scala.md
@@ -37,16 +37,16 @@ resource "snowflake_function_scala" "minimal" {
     arg_data_type = "VARCHAR(100)"
     arg_name      = "x"
   }
-  function_definition = <<EOF
+  return_type         = "VARCHAR(100)"
+  runtime_version     = "2.12"
+  handler             = "TestFunc.echoVarchar"
+  function_definition = <<EOT
   class TestFunc {
     def echoVarchar(x : String): String = {
       return x
     }
   }
-  EOF
-  runtime_version     = "2.12"
-  handler             = "TestFunc.echoVarchar"
-  return_type         = "VARCHAR(100)"
+EOT
 }
 
 # Complete
@@ -61,13 +61,13 @@ resource "snowflake_function_scala" "complete" {
   }
   comment                      = "some comment"
   external_access_integrations = ["external_access_integration_name", "external_access_integration_name_2"]
-  function_definition          = <<EOF
+  function_definition          = <<EOT
   class TestFunc {
     def echoVarchar(x : String): String = {
       return x
     }
   }
-  EOF
+EOT
   handler                      = "TestFunc.echoVarchar"
   null_input_behavior          = "CALLED ON NULL INPUT"
   return_results_behavior      = "VOLATILE"
@@ -143,7 +143,7 @@ resource "snowflake_function_scala" "complete" {
 Required:
 
 - `arg_data_type` (String) The argument type.
-- `arg_name` (String) The argument name.
+- `arg_name` (String) The argument name. The provider wraps it in double quotes by default, so be aware of that while referencing the argument in the function definition.
 
 Optional:
 
diff --git a/docs/resources/function_sql.md b/docs/resources/function_sql.md
index 66124dc89f..9374f1044c 100644
--- a/docs/resources/function_sql.md
+++ b/docs/resources/function_sql.md
@@ -39,10 +39,10 @@ resource "snowflake_function_sql" "minimal" {
     arg_data_type = "FLOAT"
     arg_name      = "arg_name"
   }
-  function_definition = <<EOF
-    arg_name
-  EOF
   return_type         = "FLOAT"
+  function_definition = <<EOT
+arg_name
+EOT
 }
 
 # Complete
@@ -55,10 +55,10 @@ resource "snowflake_function_sql" "complete" {
     arg_data_type = "FLOAT"
     arg_name      = "arg_name"
   }
-  function_definition     = <<EOF
-    arg_name
-  EOF
   return_type             = "FLOAT"
+  function_definition     = <<EOT
+arg_name
+EOT
   return_results_behavior = "VOLATILE"
   comment                 = "some comment"
 }
@@ -102,7 +102,7 @@ resource "snowflake_function_sql" "complete" {
 Required:
 
 - `arg_data_type` (String) The argument type.
-- `arg_name` (String) The argument name.
+- `arg_name` (String) The argument name. The provider wraps it in double quotes by default, so be aware of that while referencing the argument in the function definition.
 
 Optional:
 
diff --git a/docs/resources/procedure_java.md b/docs/resources/procedure_java.md
index 3dd3858f89..545cd1efed 100644
--- a/docs/resources/procedure_java.md
+++ b/docs/resources/procedure_java.md
@@ -41,7 +41,14 @@ resource "snowflake_procedure_java" "basic" {
   }
   return_type          = "VARCHAR(100)"
   handler              = "TestFunc.echoVarchar"
-  procedure_definition = "\n\timport com.snowflake.snowpark_java.*;\n\tclass TestFunc {\n\t\tpublic static String echoVarchar(Session session, String x) {\n\t\t\treturn x;\n\t\t}\n\t}\n"
+  procedure_definition = <<EOT
+  import com.snowflake.snowpark_java.*;
+  class TestFunc {
+    public static String echoVarchar(Session session, String x) {
+      return x;
+    }
+  }
+EOT
   runtime_version      = "11"
   snowpark_package     = "1.14.0"
 }
@@ -57,7 +64,14 @@ resource "snowflake_procedure_java" "full" {
   }
   return_type          = "VARCHAR(100)"
   handler              = "TestFunc.echoVarchar"
-  procedure_definition = "\n\timport com.snowflake.snowpark_java.*;\n\tclass TestFunc {\n\t\tpublic static String echoVarchar(Session session, String x) {\n\t\t\treturn x;\n\t\t}\n\t}\n"
+  procedure_definition = <<EOT
+    import com.snowflake.snowpark_java.*;
+  class TestFunc {
+    public static String echoVarchar(Session session, String x) {
+      return x;
+    }
+  }
+EOT
   runtime_version      = "11"
   snowpark_package     = "1.14.0"
 
@@ -139,7 +153,7 @@ resource "snowflake_procedure_java" "full" {
 Required:
 
 - `arg_data_type` (String) The argument type.
-- `arg_name` (String) The argument name.
+- `arg_name` (String) The argument name. The provider wraps it in double quotes by default, so be aware of that while referencing the argument in the procedure definition.
 
 Optional:
 
diff --git a/docs/resources/procedure_javascript.md b/docs/resources/procedure_javascript.md
index fd50fab116..8b2c7c201d 100644
--- a/docs/resources/procedure_javascript.md
+++ b/docs/resources/procedure_javascript.md
@@ -40,7 +40,13 @@ resource "snowflake_procedure_javascript" "basic" {
     arg_name      = "x"
   }
   return_type          = "VARCHAR(100)"
-  procedure_definition = "\n\tif (x \u003c= 0) {\n\t\treturn 1;\n\t} else {\n\t\tvar result = 1;\n\t\tfor (var i = 2; i \u003c= x; i++) {\n\t\t\tresult = result * i;\n\t\t}\n\t\treturn result;\n\t}\n"
+  procedure_definition = <<EOT
+  if (x == 0) {
+    return 1;
+  } else {
+    return 2;
+  }
+EOT
 }
 ```
 -> **Note** Instead of using fully_qualified_name, you can reference objects managed outside Terraform by constructing a correct ID, consult [identifiers guide](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/guides/identifiers#new-computed-fully-qualified-name-field-in-resources).
@@ -83,7 +89,7 @@ resource "snowflake_procedure_javascript" "basic" {
 Required:
 
 - `arg_data_type` (String) The argument type.
-- `arg_name` (String) The argument name.
+- `arg_name` (String) The argument name. The provider wraps it in double quotes by default, so be aware of that while referencing the argument in the procedure definition.
 
 Optional:
 
diff --git a/docs/resources/procedure_python.md b/docs/resources/procedure_python.md
index 76d9495fd4..0ad0eb5505 100644
--- a/docs/resources/procedure_python.md
+++ b/docs/resources/procedure_python.md
@@ -7,6 +7,8 @@ description: |-
 
 !> **Caution: Preview Feature** This feature is considered a preview feature in the provider, regardless of the state of the resource in Snowflake. We do not guarantee its stability. It will be reworked and marked as a stable feature in future releases. Breaking changes are expected, even without bumping the major version. To use this feature, add the relevant feature name to `preview_features_enabled field` in the [provider configuration](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs#schema). Please always refer to the [Getting Help](https://github.com/Snowflake-Labs/terraform-provider-snowflake?tab=readme-ov-file#getting-help) section in our Github repo to best determine how to get help for your questions.
 
+!> **Caution: Import limitation** To import the python procedure, snowflake-snowpark-python version must be explicitly set in Snowflake (i.e. `snowflake-snowpark-python==1.14.0`). You can verify it by running `DESCRIBE PROCEDURE <your_procedure>` and checking the `packages`. Check [#3303](https://github.com/Snowflake-Labs/terraform-provider-snowflake/issues/3303) for reference.
+
 -> **Note** External changes to `is_secure` and `null_input_behavior` are not currently supported. They will be handled in the following versions of the provider which may still affect this resource.
 
 -> **Note** `COPY GRANTS` and `OR REPLACE` are not currently supported.
@@ -42,7 +44,13 @@ resource "snowflake_procedure_python" "w" {
   }
   return_type          = "VARCHAR(100)"
   handler              = "echoVarchar"
-  procedure_definition = "\ndef echoVarchar(x):\n\tresult = \"\"\n\tfor a in range(5):\n\t\tresult += x\n\treturn result\n"
+  procedure_definition = <<EOT
+  def echoVarchar(x):
+  result = ''
+  for a in range(5):
+    result += x
+  return result
+EOT
   runtime_version      = "3.8"
   snowpark_package     = "1.14.0"
 }
@@ -94,7 +102,7 @@ resource "snowflake_procedure_python" "w" {
 Required:
 
 - `arg_data_type` (String) The argument type.
-- `arg_name` (String) The argument name.
+- `arg_name` (String) The argument name. The provider wraps it in double quotes by default, so be aware of that while referencing the argument in the procedure definition.
 
 Optional:
 
diff --git a/docs/resources/procedure_scala.md b/docs/resources/procedure_scala.md
index 0b6cf82659..f119d62a4b 100644
--- a/docs/resources/procedure_scala.md
+++ b/docs/resources/procedure_scala.md
@@ -38,7 +38,14 @@ resource "snowflake_procedure_scala" "w" {
   }
   return_type          = "VARCHAR(100)"
   handler              = "TestFunc.echoVarchar"
-  procedure_definition = "\n\timport com.snowflake.snowpark_java.Session\n\n\tclass TestFunc {\n\t\tdef echoVarchar(session : Session, x : String): String = {\n\t\t\treturn x\n\t\t}\n\t}\n"
+  procedure_definition = <<EOT
+  import com.snowflake.snowpark_java.Session
+  class TestFunc {
+    def echoVarchar(session : Session, x : String): String = {
+      return x
+    }
+  }
+EOT
   runtime_version      = "2.12"
   snowpark_package     = "1.14.0"
 }
@@ -91,7 +98,7 @@ resource "snowflake_procedure_scala" "w" {
 Required:
 
 - `arg_data_type` (String) The argument type.
-- `arg_name` (String) The argument name.
+- `arg_name` (String) The argument name. The provider wraps it in double quotes by default, so be aware of that while referencing the argument in the procedure definition.
 
 Optional:
 
diff --git a/docs/resources/procedure_sql.md b/docs/resources/procedure_sql.md
index 6aefb8e115..fcf7441ee8 100644
--- a/docs/resources/procedure_sql.md
+++ b/docs/resources/procedure_sql.md
@@ -37,7 +37,11 @@ resource "snowflake_procedure_sql" "w" {
     arg_name      = "x"
   }
   return_type          = "VARCHAR(100)"
-  procedure_definition = "\nBEGIN\n  RETURN message;\nEND;\n"
+  procedure_definition = <<EOT
+BEGIN
+  RETURN message;
+END;
+EOT
 }
 ```
 -> **Note** Instead of using fully_qualified_name, you can reference objects managed outside Terraform by constructing a correct ID, consult [identifiers guide](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/guides/identifiers#new-computed-fully-qualified-name-field-in-resources).
@@ -80,7 +84,7 @@ resource "snowflake_procedure_sql" "w" {
 Required:
 
 - `arg_data_type` (String) The argument type.
-- `arg_name` (String) The argument name.
+- `arg_name` (String) The argument name. The provider wraps it in double quotes by default, so be aware of that while referencing the argument in the procedure definition.
 
 Optional:
 
diff --git a/examples/resources/snowflake_function_java/resource.tf b/examples/resources/snowflake_function_java/resource.tf
index a34d6af477..2be224de9c 100644
--- a/examples/resources/snowflake_function_java/resource.tf
+++ b/examples/resources/snowflake_function_java/resource.tf
@@ -8,5 +8,11 @@ resource "snowflake_function_java" "w" {
   }
   return_type         = "VARCHAR(100)"
   handler             = "TestFunc.echoVarchar"
-  function_definition = "\n\tclass TestFunc {\n\t\tpublic static String echoVarchar(String x) {\n\t\t\treturn x;\n\t\t}\n\t}\n"
+  function_definition = <<EOT
+  class TestFunc {
+    public static String echoVarchar(String x) {
+      return x;
+    }
+  }
+EOT
 }
diff --git a/examples/resources/snowflake_function_javascript/resource.tf b/examples/resources/snowflake_function_javascript/resource.tf
index 9cff28c6e0..4816e46191 100644
--- a/examples/resources/snowflake_function_javascript/resource.tf
+++ b/examples/resources/snowflake_function_javascript/resource.tf
@@ -7,8 +7,12 @@ resource "snowflake_function_javascript" "minimal" {
     arg_data_type = "VARIANT"
     arg_name      = "x"
   }
-  function_definition = <<EOF
-    return x;
-  EOF
   return_type         = "VARIANT"
+  function_definition = <<EOT
+  if (x == 0) {
+    return 1;
+  } else {
+    return 2;
+  }
+EOT
 }
diff --git a/examples/resources/snowflake_function_python/resource.tf b/examples/resources/snowflake_function_python/resource.tf
index 50a450a239..463c4ff36e 100644
--- a/examples/resources/snowflake_function_python/resource.tf
+++ b/examples/resources/snowflake_function_python/resource.tf
@@ -8,10 +8,13 @@ resource "snowflake_function_python" "minimal" {
     arg_data_type = "NUMBER(36, 2)"
     arg_name      = "x"
   }
-  function_definition = <<EOF
-    def some_function(x):
-      return x
-  EOF
-  handler             = "some_function"
   return_type         = "NUMBER(36, 2)"
+  handler             = "some_function"
+  function_definition = <<EOT
+def some_function(x):
+  result = ''
+  for a in range(5):
+    result += x
+  return result
+EOT
 }
diff --git a/examples/resources/snowflake_function_scala/resource.tf b/examples/resources/snowflake_function_scala/resource.tf
index 0fa07b79ff..206ceebc81 100644
--- a/examples/resources/snowflake_function_scala/resource.tf
+++ b/examples/resources/snowflake_function_scala/resource.tf
@@ -7,16 +7,16 @@ resource "snowflake_function_scala" "minimal" {
     arg_data_type = "VARCHAR(100)"
     arg_name      = "x"
   }
-  function_definition = <<EOF
+  return_type         = "VARCHAR(100)"
+  runtime_version     = "2.12"
+  handler             = "TestFunc.echoVarchar"
+  function_definition = <<EOT
   class TestFunc {
     def echoVarchar(x : String): String = {
       return x
     }
   }
-  EOF
-  runtime_version     = "2.12"
-  handler             = "TestFunc.echoVarchar"
-  return_type         = "VARCHAR(100)"
+EOT
 }
 
 # Complete
@@ -31,13 +31,13 @@ resource "snowflake_function_scala" "complete" {
   }
   comment                      = "some comment"
   external_access_integrations = ["external_access_integration_name", "external_access_integration_name_2"]
-  function_definition          = <<EOF
+  function_definition          = <<EOT
   class TestFunc {
     def echoVarchar(x : String): String = {
       return x
     }
   }
-  EOF
+EOT
   handler                      = "TestFunc.echoVarchar"
   null_input_behavior          = "CALLED ON NULL INPUT"
   return_results_behavior      = "VOLATILE"
diff --git a/examples/resources/snowflake_function_sql/resource.tf b/examples/resources/snowflake_function_sql/resource.tf
index 16a91889dd..6561687c41 100644
--- a/examples/resources/snowflake_function_sql/resource.tf
+++ b/examples/resources/snowflake_function_sql/resource.tf
@@ -7,10 +7,10 @@ resource "snowflake_function_sql" "minimal" {
     arg_data_type = "FLOAT"
     arg_name      = "arg_name"
   }
-  function_definition = <<EOF
-    arg_name
-  EOF
   return_type         = "FLOAT"
+  function_definition = <<EOT
+arg_name
+EOT
 }
 
 # Complete
@@ -23,10 +23,10 @@ resource "snowflake_function_sql" "complete" {
     arg_data_type = "FLOAT"
     arg_name      = "arg_name"
   }
-  function_definition     = <<EOF
-    arg_name
-  EOF
   return_type             = "FLOAT"
+  function_definition     = <<EOT
+arg_name
+EOT
   return_results_behavior = "VOLATILE"
   comment                 = "some comment"
 }
diff --git a/examples/resources/snowflake_procedure_java/resource.tf b/examples/resources/snowflake_procedure_java/resource.tf
index 6f3bc051b9..6393b3adf7 100644
--- a/examples/resources/snowflake_procedure_java/resource.tf
+++ b/examples/resources/snowflake_procedure_java/resource.tf
@@ -9,7 +9,14 @@ resource "snowflake_procedure_java" "basic" {
   }
   return_type          = "VARCHAR(100)"
   handler              = "TestFunc.echoVarchar"
-  procedure_definition = "\n\timport com.snowflake.snowpark_java.*;\n\tclass TestFunc {\n\t\tpublic static String echoVarchar(Session session, String x) {\n\t\t\treturn x;\n\t\t}\n\t}\n"
+  procedure_definition = <<EOT
+  import com.snowflake.snowpark_java.*;
+  class TestFunc {
+    public static String echoVarchar(Session session, String x) {
+      return x;
+    }
+  }
+EOT
   runtime_version      = "11"
   snowpark_package     = "1.14.0"
 }
@@ -25,7 +32,14 @@ resource "snowflake_procedure_java" "full" {
   }
   return_type          = "VARCHAR(100)"
   handler              = "TestFunc.echoVarchar"
-  procedure_definition = "\n\timport com.snowflake.snowpark_java.*;\n\tclass TestFunc {\n\t\tpublic static String echoVarchar(Session session, String x) {\n\t\t\treturn x;\n\t\t}\n\t}\n"
+  procedure_definition = <<EOT
+    import com.snowflake.snowpark_java.*;
+  class TestFunc {
+    public static String echoVarchar(Session session, String x) {
+      return x;
+    }
+  }
+EOT
   runtime_version      = "11"
   snowpark_package     = "1.14.0"
 
diff --git a/examples/resources/snowflake_procedure_javascript/resource.tf b/examples/resources/snowflake_procedure_javascript/resource.tf
index 5ad3f42b62..cec5f08560 100644
--- a/examples/resources/snowflake_procedure_javascript/resource.tf
+++ b/examples/resources/snowflake_procedure_javascript/resource.tf
@@ -8,5 +8,11 @@ resource "snowflake_procedure_javascript" "basic" {
     arg_name      = "x"
   }
   return_type          = "VARCHAR(100)"
-  procedure_definition = "\n\tif (x \u003c= 0) {\n\t\treturn 1;\n\t} else {\n\t\tvar result = 1;\n\t\tfor (var i = 2; i \u003c= x; i++) {\n\t\t\tresult = result * i;\n\t\t}\n\t\treturn result;\n\t}\n"
+  procedure_definition = <<EOT
+  if (x == 0) {
+    return 1;
+  } else {
+    return 2;
+  }
+EOT
 }
diff --git a/examples/resources/snowflake_procedure_python/resource.tf b/examples/resources/snowflake_procedure_python/resource.tf
index 3f4987d36b..14642e6f6a 100644
--- a/examples/resources/snowflake_procedure_python/resource.tf
+++ b/examples/resources/snowflake_procedure_python/resource.tf
@@ -8,7 +8,13 @@ resource "snowflake_procedure_python" "w" {
   }
   return_type          = "VARCHAR(100)"
   handler              = "echoVarchar"
-  procedure_definition = "\ndef echoVarchar(x):\n\tresult = \"\"\n\tfor a in range(5):\n\t\tresult += x\n\treturn result\n"
+  procedure_definition = <<EOT
+  def echoVarchar(x):
+  result = ''
+  for a in range(5):
+    result += x
+  return result
+EOT
   runtime_version      = "3.8"
   snowpark_package     = "1.14.0"
 }
diff --git a/examples/resources/snowflake_procedure_scala/resource.tf b/examples/resources/snowflake_procedure_scala/resource.tf
index 889473e122..becdca1717 100644
--- a/examples/resources/snowflake_procedure_scala/resource.tf
+++ b/examples/resources/snowflake_procedure_scala/resource.tf
@@ -8,7 +8,14 @@ resource "snowflake_procedure_scala" "w" {
   }
   return_type          = "VARCHAR(100)"
   handler              = "TestFunc.echoVarchar"
-  procedure_definition = "\n\timport com.snowflake.snowpark_java.Session\n\n\tclass TestFunc {\n\t\tdef echoVarchar(session : Session, x : String): String = {\n\t\t\treturn x\n\t\t}\n\t}\n"
+  procedure_definition = <<EOT
+  import com.snowflake.snowpark_java.Session
+  class TestFunc {
+    def echoVarchar(session : Session, x : String): String = {
+      return x
+    }
+  }
+EOT
   runtime_version      = "2.12"
   snowpark_package     = "1.14.0"
 }
diff --git a/examples/resources/snowflake_procedure_sql/resource.tf b/examples/resources/snowflake_procedure_sql/resource.tf
index 77258c73d9..a10b403b59 100644
--- a/examples/resources/snowflake_procedure_sql/resource.tf
+++ b/examples/resources/snowflake_procedure_sql/resource.tf
@@ -7,5 +7,9 @@ resource "snowflake_procedure_sql" "w" {
     arg_name      = "x"
   }
   return_type          = "VARCHAR(100)"
-  procedure_definition = "\nBEGIN\n  RETURN message;\nEND;\n"
+  procedure_definition = <<EOT
+BEGIN
+  RETURN message;
+END;
+EOT
 }
diff --git a/pkg/internal/tracking/context.go b/pkg/internal/tracking/context.go
index 412ff9eb77..371cd2fe49 100644
--- a/pkg/internal/tracking/context.go
+++ b/pkg/internal/tracking/context.go
@@ -10,7 +10,7 @@ import (
 
 const (
 	CurrentSchemaVersion string = "1"
-	ProviderVersion      string = "v1.0.0" // TODO(SNOW-1814934): Currently hardcoded, make it computed
+	ProviderVersion      string = "v1.0.1" // TODO(SNOW-1814934): Currently hardcoded, make it computed
 	MetadataPrefix       string = "terraform_provider_usage_tracking"
 )
 
diff --git a/pkg/resources/account_parameter_acceptance_test.go b/pkg/resources/account_parameter_acceptance_test.go
index 6ee2edb147..2df5a3a9dc 100644
--- a/pkg/resources/account_parameter_acceptance_test.go
+++ b/pkg/resources/account_parameter_acceptance_test.go
@@ -142,7 +142,7 @@ func TestAcc_AccountParameter_ENFORCE_NETWORK_RULES_FOR_INTERNAL_STAGES(t *testi
 		CheckDestroy: acc.CheckAccountParameterUnset(t, sdk.AccountParameterRequireStorageIntegrationForStageCreation),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: assert.AssertThat(t, resourceassert.AccountParameterResource(t, model.ResourceReference()).
 					HasKeyString(string(sdk.AccountParameterRequireStorageIntegrationForStageCreation)).
 					HasValueString("true"),
@@ -163,7 +163,7 @@ func TestAcc_AccountParameter_INITIAL_REPLICATION_SIZE_LIMIT_IN_TB(t *testing.T)
 		CheckDestroy: acc.CheckAccountParameterUnset(t, sdk.AccountParameterInitialReplicationSizeLimitInTB),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: assert.AssertThat(t, resourceassert.AccountParameterResource(t, model.ResourceReference()).
 					HasKeyString(string(sdk.AccountParameterInitialReplicationSizeLimitInTB)).
 					HasValueString("3.0"),
diff --git a/pkg/resources/function_commons.go b/pkg/resources/function_commons.go
index c9c8bf05e6..89b675a7b7 100644
--- a/pkg/resources/function_commons.go
+++ b/pkg/resources/function_commons.go
@@ -226,7 +226,7 @@ func functionBaseSchema() map[string]schema.Schema {
 						Type:     schema.TypeString,
 						Required: true,
 						// TODO [SNOW-1348103]: adjust diff suppression accordingly.
-						Description: "The argument name.",
+						Description: "The argument name. The provider wraps it in double quotes by default, so be aware of that while referencing the argument in the function definition.",
 					},
 					// TODO [SNOW-1348103]: after testing weird names add limitations to the docs and add validation here
 					"arg_data_type": {
diff --git a/pkg/resources/procedure_commons.go b/pkg/resources/procedure_commons.go
index 1cd819647b..f87b694b47 100644
--- a/pkg/resources/procedure_commons.go
+++ b/pkg/resources/procedure_commons.go
@@ -217,7 +217,7 @@ func procedureBaseSchema() map[string]schema.Schema {
 						Type:     schema.TypeString,
 						Required: true,
 						// TODO [SNOW-1348103]: adjust diff suppression accordingly.
-						Description: "The argument name.",
+						Description: "The argument name. The provider wraps it in double quotes by default, so be aware of that while referencing the argument in the procedure definition.",
 					},
 					"arg_data_type": {
 						Type:             schema.TypeString,
diff --git a/pkg/sdk/parameters.go b/pkg/sdk/parameters.go
index 86551dd14e..aea226a018 100644
--- a/pkg/sdk/parameters.go
+++ b/pkg/sdk/parameters.go
@@ -1216,7 +1216,6 @@ func (v *AccountParameters) validate() error {
 		if err != nil || value < 0 {
 			return fmt.Errorf("InitialReplicationSizeLimitInTB must be a non-negative float, got %v", *v.InitialReplicationSizeLimitInTB)
 		}
-
 	}
 	if valueSet(v.MinDataRetentionTimeInDays) {
 		if !validateIntInRangeInclusive(*v.MinDataRetentionTimeInDays, 0, 90) {
diff --git a/templates/resources/procedure_python.md.tmpl b/templates/resources/procedure_python.md.tmpl
index 2636c371fa..1b16fbd8a4 100644
--- a/templates/resources/procedure_python.md.tmpl
+++ b/templates/resources/procedure_python.md.tmpl
@@ -11,6 +11,8 @@ description: |-
 
 !> **Caution: Preview Feature** This feature is considered a preview feature in the provider, regardless of the state of the resource in Snowflake. We do not guarantee its stability. It will be reworked and marked as a stable feature in future releases. Breaking changes are expected, even without bumping the major version. To use this feature, add the relevant feature name to `preview_features_enabled field` in the [provider configuration](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs#schema). Please always refer to the [Getting Help](https://github.com/Snowflake-Labs/terraform-provider-snowflake?tab=readme-ov-file#getting-help) section in our Github repo to best determine how to get help for your questions.
 
+!> **Caution: Import limitation** To import the python procedure, snowflake-snowpark-python version must be explicitly set in Snowflake (i.e. `snowflake-snowpark-python==1.14.0`). You can verify it by running `DESCRIBE PROCEDURE <your_procedure>` and checking the `packages`. Check [#3303](https://github.com/Snowflake-Labs/terraform-provider-snowflake/issues/3303) for reference.
+
 -> **Note** External changes to `is_secure` and `null_input_behavior` are not currently supported. They will be handled in the following versions of the provider which may still affect this resource.
 
 -> **Note** `COPY GRANTS` and `OR REPLACE` are not currently supported.
diff --git a/v1-preparations/LIST_OF_PREVIEW_FEATURES_FOR_V1.md b/v1-preparations/LIST_OF_PREVIEW_FEATURES_FOR_V1.md
index 93164a2c18..d0c39508a4 100644
--- a/v1-preparations/LIST_OF_PREVIEW_FEATURES_FOR_V1.md
+++ b/v1-preparations/LIST_OF_PREVIEW_FEATURES_FOR_V1.md
@@ -1,6 +1,6 @@
 # List of preview resources and data sources that are available in V1
 
-[Preview features](../ROADMAP.md#preview-resourcesdata sources) for the V1:
+[Preview features](../ROADMAP.md#preview-resourcesdatasources) for the V1:
 
 * [snowflake_current_account](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/1.0.0/docs/data-sources/current_account) (data source)
 * [snowflake_account_password_policy_attachment](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/1.0.0/docs/resources/account_password_policy_attachment)