diff --git a/changelog/972.md b/changelog/972.md
new file mode 100644
index 000000000..e1e930a3c
--- /dev/null
+++ b/changelog/972.md
@@ -0,0 +1 @@
+- Fix Smarty::assign() not returning $this when called with an array as first parameter [#972](https://github.com/smarty-php/smarty/pull/972)
\ No newline at end of file
diff --git a/changelog/979.md b/changelog/979.md
new file mode 100644
index 000000000..75eb84fe5
--- /dev/null
+++ b/changelog/979.md
@@ -0,0 +1 @@
+- Fixed missing Smarty getErrorUnassigned/setErrorUnassigned methods [#979](https://github.com/smarty-php/smarty/issues/979)
\ No newline at end of file
diff --git a/make-release.sh b/make-release.sh
index 2b6db0d75..a5e9ffdea 100755
--- a/make-release.sh
+++ b/make-release.sh
@@ -15,7 +15,7 @@ php utilities/update-smarty-version-number.php $1
 git add changelog CHANGELOG.md src/Smarty.php
 git commit -m "version bump"
 
-git checkout master
+git checkout support/5
 git pull
 git merge --no-ff "release/$1"
 git branch -d "release/$1"
diff --git a/src/Smarty.php b/src/Smarty.php
index 4f1bf425d..85600c78e 100644
--- a/src/Smarty.php
+++ b/src/Smarty.php
@@ -2227,6 +2227,22 @@ private function returnOrCreateTemplate($template, $cache_id = null, $compile_id
 	}
 
 	/**
+	 * Whether Smarty displays an error when using an unassigned variable
+	 */
+	public function getErrorUnassigned(): bool
+	{
+		return (bool) $this->error_unassigned;
+	}
+
+	/**
+	 * Set if Smarty should display an error on using an unassigned variable
+	 */
+	public function setErrorUnassigned(bool $error_unassigned): void
+	{
+		$this->error_unassigned = $error_unassigned;
+  }
+  
+  /**
 	 * Sets if Smarty should check If-Modified-Since headers to determine cache validity.
 	 * @param bool $cache_modified_check
 	 * @return void
@@ -2236,4 +2252,3 @@ public function setCacheModifiedCheck($cache_modified_check): void {
 	}
 
 }
-