diff --git a/WHATSNEW.md b/WHATSNEW.md
index 61c3aaaaf3b589f35444e7126f6dd3a4768eb772..653f8a5c0462d8d7630c5506b4b4099a29fe27c1 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -1,3 +1,45 @@
+osTicket v1.9.7
+===============
+### Enhancements
+  * Remote IP is logged for staff replies (#1846)
+  * Add option to require client login to view knowledge base (#1851)
+  * Internal activity alert, replacing the internal note alert, includes alerts
+    of responses made by other agents (#1865)
+  * Email system now uses LF instead of CRLF as the default (#1909)
+  * Mass actions for user directory (#1924)
+  * Unassign tickets on transfer if current assignee is not a member of the new
+    department and the department has "Restrict assignment to members" enabled
+    (#1923)
+
+### Improvements
+  * Clear overdue flag when a ticket is closed, thanks @A-Lawrence (#1739)
+  * Clear attached file listing on client post (regression) (#1845)
+  * Delete ticket custom data on delete (#1840)
+  * Trim whitespace from filter match data on update (#1844)
+  * Fix dropping of custom data on API post (#1839)
+  * Fix advanced search on create date (#1848)
+  * Fix initial load and pagination of dashboard page (#1856)
+  * Fix incorrect internal/public category setting in drop down for new FAQ
+    (#1867)
+  * Add UTF-8 BOM to CSV export for correct Unicode detection (#1869)
+  * Fix not considering the setting for alert assigned on new message (#1850)
+  * Skip new activity notice if collaborator(s) included in email To or Cc
+    header (#1871)
+  * Fix inability to uncheck a custom data checkbox (#1866)
+  * Fix advanced search for unassigned tickets (#1857)
+  * Fix navigation warning if not using the lock feature (#1898)
+  * Fix detection of message of some bounce notices (#1914)
+  * Fix SQL alert with multiple Message-ID headers (#1920)
+  * Add a warning if attempting to configure archiving for POP accounts (#1921)
+  * Fix missing UTF-8 output encoding header for staff control panel (#1918)
+  * Fix z-index issue between popup previews and modal dialogs (#1919)
+  * Record imported file backend when importing files (f1e31ba)
+
+### Performance and Security
+  * Fix XSS vulnerability in sequence management (88bedbd)
+  * Defer loading of thread email header information when loading ticket thread
+    (#1900)
+
 osTicket v1.9.6
 ===============
 ### Enhancements
diff --git a/include/class.template.php b/include/class.template.php
index d8e2b8a5d61af30a15e9ad1347772dc417b53695..00a81c066c486a9fe9f95c1fea17b3bae57c683e 100644
--- a/include/class.template.php
+++ b/include/class.template.php
@@ -65,8 +65,8 @@ class EmailTemplateGroup {
             'desc'=>/* @trans */ 'Alert sent to agents, if enabled, when user replies to an existing ticket.'),
         'note.alert'=>array(
             'group'=>'ticket.staff',
-            'name'=>/* @trans */ 'Internal Note Alert',
-            'desc'=>/* @trans */ 'Alert sent to selected agents, if enabled, on new internal note.'),
+            'name'=>/* @trans */ 'Internal Activity Alert',
+            'desc'=>/* @trans */ 'Alert sent out to Agents when internal activity such as an internal note or an agent reply is appended to a ticket.'),
         'assigned.alert'=>array(
             'group'=>'ticket.staff',
             'name'=>/* @trans */ 'Ticket Assignment Alert',
diff --git a/include/i18n/en_US/help/tips/staff.department.yaml b/include/i18n/en_US/help/tips/staff.department.yaml
index 0c6f555c240fb2b4609e8f325c2bf8059c0624fc..28637faa31a1c7738208b306bf2a9f2c95ae1a38 100644
--- a/include/i18n/en_US/help/tips/staff.department.yaml
+++ b/include/i18n/en_US/help/tips/staff.department.yaml
@@ -72,7 +72,7 @@ group_membership:
 sandboxing:
     title: Ticket Assignment Restrictions
     content: >
-        Enable this to restrict ticket assignement to only include members
+        Enable this to restrict ticket assignment to include only members
         of this Department. Department membership can be extended to Groups,
         if <span class="doc-desc-title">Alerts &amp; Notices
         Recipients</span> includes groups members.