diff --git a/VERSION b/VERSION
index d647c8a44..1d3b40ecf 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.36.2
+0.36.3
diff --git a/docs/source/developing-idom/changelog.rst b/docs/source/developing-idom/changelog.rst
index 1cadde992..ab678f088 100644
--- a/docs/source/developing-idom/changelog.rst
+++ b/docs/source/developing-idom/changelog.rst
@@ -7,6 +7,23 @@ team are working on, or have feedback on how issues should be prioritized, feel
 :discussion-type:`open up a discussion <question>`.
 
 
+0.36.3
+------
+
+Misc bug fixes along with a minor improvement that allows components to return ``None``
+to render nothing.
+
+**Closed Issues**
+
+- All child states wiped upon any child key change - :issue:`652`
+- Allow NoneType returns within components - :issue:`538`
+
+**Merged Pull Requests**
+
+- fix #652 - :pull:`672`
+- Fix 663 - :pull:`667`
+
+
 0.36.2
 ------
 
diff --git a/scripts/changes_since_release.py b/scripts/changes_since_release.py
index 3ec174a65..dfaa840dc 100644
--- a/scripts/changes_since_release.py
+++ b/scripts/changes_since_release.py
@@ -12,20 +12,20 @@
 
 SECTION_FORMAT_TEMPLATES = {
     "md": lambda title: f"# {title}",
-    "rst": lambda title: f"**{title}**",
+    "rst": lambda title: f"**{title}**\n",
     "text": lambda title: f"{title}\n{'-' * len(title)}",
 }
 
 
 ISSUE_FORMAT_TEMPLATES = {
     "md": lambda title, number, **_: f"- {title} - [#{number}](https://github.com/{REPO_NAME}/issues/{number})",
-    "rst": lambda title, number, **_: f"- {title} - :pull:`{number}`",
+    "rst": lambda title, number, **_: f"- {title} - :issue:`{number}`",
     "text": lambda title, number, **_: f"- {title} - #{number}",
 }
 
 PULL_REQUEST_FORMAT_TEMPLATES = {
     "md": lambda title, number, **_: f"- {title} - [#{number}](https://github.com/{REPO_NAME}/pull/{number})",
-    "rst": lambda title, number, **_: f"- {title} - :issue:`{number}`",
+    "rst": lambda title, number, **_: f"- {title} - :pull:`{number}`",
     "text": lambda title, number, **_: f"- {title} - #{number}",
 }
 
diff --git a/src/client/package-lock.json b/src/client/package-lock.json
index 2b866c249..18339d470 100644
--- a/src/client/package-lock.json
+++ b/src/client/package-lock.json
@@ -1,11 +1,11 @@
 {
   "name": "client",
-  "version": "0.36.2",
+  "version": "0.36.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "version": "0.36.2",
+      "version": "0.36.3",
       "license": "MIT",
       "workspaces": [
         "./packages/*"
@@ -2632,7 +2632,7 @@
       "dev": true
     },
     "packages/idom-app-react": {
-      "version": "0.36.2",
+      "version": "0.36.3",
       "license": "MIT",
       "dependencies": {
         "idom-client-react": "file:packages/idom-client-react",
@@ -2649,7 +2649,7 @@
     },
     "packages/idom-app-react/packages/idom-client-react": {},
     "packages/idom-client-react": {
-      "version": "0.36.2",
+      "version": "0.36.3",
       "license": "MIT",
       "dependencies": {
         "fast-json-patch": "^3.0.0-1",
diff --git a/src/client/package.json b/src/client/package.json
index 4f69ed8b3..02bb4cb6a 100644
--- a/src/client/package.json
+++ b/src/client/package.json
@@ -14,7 +14,7 @@
     "publish": "npm --workspaces publish",
     "test": "npm --workspaces test"
   },
-  "version": "0.36.2",
+  "version": "0.36.3",
   "workspaces": [
     "./packages/*"
   ]
diff --git a/src/client/packages/idom-app-react/package.json b/src/client/packages/idom-app-react/package.json
index ffba6adbc..0e1ded781 100644
--- a/src/client/packages/idom-app-react/package.json
+++ b/src/client/packages/idom-app-react/package.json
@@ -21,5 +21,5 @@
     "format": "prettier --write ./src",
     "test": "echo 'no tests'"
   },
-  "version": "0.36.2"
+  "version": "0.36.3"
 }
diff --git a/src/client/packages/idom-client-react/package.json b/src/client/packages/idom-client-react/package.json
index 9e4f9fa64..9ad405ba0 100644
--- a/src/client/packages/idom-client-react/package.json
+++ b/src/client/packages/idom-client-react/package.json
@@ -31,5 +31,5 @@
     "test": "uvu tests"
   },
   "type": "module",
-  "version": "0.36.2"
+  "version": "0.36.3"
 }
diff --git a/src/idom/__init__.py b/src/idom/__init__.py
index a6956c68d..3d2324140 100644
--- a/src/idom/__init__.py
+++ b/src/idom/__init__.py
@@ -21,7 +21,7 @@
 
 
 __author__ = "idom-team"
-__version__ = "0.36.2"  # DO NOT MODIFY
+__version__ = "0.36.3"  # DO NOT MODIFY
 
 __all__ = [
     "component",