diff --git a/.changes/unreleased/BUG FIXES-20250507-174510.yaml b/.changes/unreleased/BUG FIXES-20250507-174510.yaml
deleted file mode 100644
index 198884527..000000000
--- a/.changes/unreleased/BUG FIXES-20250507-174510.yaml	
+++ /dev/null
@@ -1,5 +0,0 @@
-kind: BUG FIXES
-body: 'ImportState: Fixes a bug where an identity attribute set to `null` would panic when testing import via identity.'
-time: 2025-05-07T17:45:10.221508-04:00
-custom:
-    Issue: "499"
diff --git a/.changes/unreleased/upcoming-stable/ENHANCEMENTS-20250325-121007.yaml b/.changes/unreleased/ENHANCEMENTS-20250325-121007.yaml
similarity index 100%
rename from .changes/unreleased/upcoming-stable/ENHANCEMENTS-20250325-121007.yaml
rename to .changes/unreleased/ENHANCEMENTS-20250325-121007.yaml
diff --git a/.changes/unreleased/upcoming-stable/ENHANCEMENTS-20250325-174504.yaml b/.changes/unreleased/ENHANCEMENTS-20250325-174504.yaml
similarity index 100%
rename from .changes/unreleased/upcoming-stable/ENHANCEMENTS-20250325-174504.yaml
rename to .changes/unreleased/ENHANCEMENTS-20250325-174504.yaml
diff --git a/.changes/unreleased/FEATURES-20250512-110617.yaml b/.changes/unreleased/FEATURES-20250512-110617.yaml
new file mode 100644
index 000000000..8e4db3c42
--- /dev/null
+++ b/.changes/unreleased/FEATURES-20250512-110617.yaml
@@ -0,0 +1,6 @@
+kind: FEATURES
+body: 'ImportState: Added support for testing plannable import via Terraform configuration. Configuration is used from the previous test
+  step if available. `Config`, `ConfigFile`, and `ConfigDirectory` can also be used directly with `ImportState` if needed.'
+time: 2025-05-12T11:06:17.498469-04:00
+custom:
+    Issue: "442"
diff --git a/.changes/unreleased/FEATURES-20250512-110745.yaml b/.changes/unreleased/FEATURES-20250512-110745.yaml
new file mode 100644
index 000000000..223061aad
--- /dev/null
+++ b/.changes/unreleased/FEATURES-20250512-110745.yaml
@@ -0,0 +1,6 @@
+kind: FEATURES
+body: 'ImportState: Added `ImportStateKind` to control which method of import the `ImportState` test step uses. `ImportCommandWithID` (default, same behavior as today)
+  , `ImportBlockWithID`, and `ImportBlockWithResourceIdentity`.'
+time: 2025-05-12T11:07:45.563529-04:00
+custom:
+    Issue: "442"
diff --git a/.changes/unreleased/FEATURES-20250512-111342.yaml b/.changes/unreleased/FEATURES-20250512-111342.yaml
new file mode 100644
index 000000000..c20b0d254
--- /dev/null
+++ b/.changes/unreleased/FEATURES-20250512-111342.yaml
@@ -0,0 +1,5 @@
+kind: FEATURES
+body: 'ImportState: Added `ImportStateConfigExact` to opt-out of new import config generation for plannable import.'
+time: 2025-05-12T11:13:42.978209-04:00
+custom:
+    Issue: "494"
diff --git a/.changes/unreleased/upcoming-stable/NOTES-20250325-084449.yaml b/.changes/unreleased/NOTES-20250325-084449.yaml
similarity index 100%
rename from .changes/unreleased/upcoming-stable/NOTES-20250325-084449.yaml
rename to .changes/unreleased/NOTES-20250325-084449.yaml
diff --git a/.changes/unreleased/NOTES-20250506-121618.yaml b/.changes/unreleased/NOTES-20250506-121618.yaml
deleted file mode 100644
index 028c3fa58..000000000
--- a/.changes/unreleased/NOTES-20250506-121618.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-kind: NOTES
-body: 'ImportState: extend auto-generated import blocks to work with `ConfigFile` and `ConfigDirectory`; adds `ConfigExact` flag to opt out'
-time: 2025-05-06T12:16:18.375025-04:00
-custom:
-    Issue: "494"