diff --git a/Documentation/Changelog.md b/Documentation/Changelog.md
index 52a934b05..d97505431 100644
--- a/Documentation/Changelog.md
+++ b/Documentation/Changelog.md
@@ -31,6 +31,7 @@
 
 For more details, please refer to:
 
+* [MariaDB MaxScale 2.3.7 Release Notes](Release-Notes/MaxScale-2.3.7-Release-Notes.md)
 * [MariaDB MaxScale 2.3.6 Release Notes](Release-Notes/MaxScale-2.3.6-Release-Notes.md)
 * [MariaDB MaxScale 2.3.5 Release Notes](Release-Notes/MaxScale-2.3.5-Release-Notes.md)
 * [MariaDB MaxScale 2.3.4 Release Notes](Release-Notes/MaxScale-2.3.4-Release-Notes.md)
diff --git a/Documentation/Release-Notes/MaxScale-2.3.7-Release-Notes.md b/Documentation/Release-Notes/MaxScale-2.3.7-Release-Notes.md
new file mode 100644
index 000000000..1f36a6f24
--- /dev/null
+++ b/Documentation/Release-Notes/MaxScale-2.3.7-Release-Notes.md
@@ -0,0 +1,47 @@
+# MariaDB MaxScale 2.3.7 Release Notes -- 2019-05-16
+
+Release 2.3.7 is a GA release.
+
+This document describes the changes in release 2.3.7, when compared to the
+previous release in the same series.
+
+For any problems you encounter, please consider submitting a bug
+report on [our Jira](https://jira.mariadb.org/projects/MXS).
+
+## New Features
+
+* [MXS-1469](https://jira.mariadb.org/browse/MXS-1469) Galeramon: Server-side initiated maintenance mode
+
+## Bug fixes
+
+* [MXS-2474](https://jira.mariadb.org/browse/MXS-2474) Housekeeper allows the registration of the same task multiple times
+* [MXS-2472](https://jira.mariadb.org/browse/MXS-2472) BinlogRouter's "Using secondary masters" documentation is incomplete
+* [MXS-2457](https://jira.mariadb.org/browse/MXS-2457) MaxScale Mask Filter incorrectly handles ANSI_QUOTES
+* [MXS-2450](https://jira.mariadb.org/browse/MXS-2450) Crash on COM_CHANGE_USER with disable_sescmd_history=true
+* [MXS-2433](https://jira.mariadb.org/browse/MXS-2433) infinite memory usage, possible leak
+* [MXS-2427](https://jira.mariadb.org/browse/MXS-2427) namedserverfilter fails to direct query if first server listed in targetXY is in maintenance mode
+* [MXS-2415](https://jira.mariadb.org/browse/MXS-2415) data for new AVRO versions is not send via cdc
+* [MXS-2381](https://jira.mariadb.org/browse/MXS-2381) Admin user passwords cannot be changed
+* [MXS-2366](https://jira.mariadb.org/browse/MXS-2366) Wrong tarball RPATH
+* [MXS-2315](https://jira.mariadb.org/browse/MXS-2315) std::regex_error exception on csmon startup
+* [MXS-2046](https://jira.mariadb.org/browse/MXS-2046) Memory leak in binlog router
+
+## Known Issues and Limitations
+
+There are some limitations and known issues within this version of MaxScale.
+For more information, please refer to the [Limitations](../About/Limitations.md) document.
+
+## Packaging
+
+RPM and Debian packages are provided for supported the Linux distributions.
+
+Packages can be downloaded [here](https://mariadb.com/downloads/mariadb-tx/maxscale).
+
+## Source Code
+
+The source code of MaxScale is tagged at GitHub with a tag, which is identical
+with the version of MaxScale. For instance, the tag of version X.Y.Z of MaxScale
+is `maxscale-X.Y.Z`. Further, the default branch is always the latest GA version
+of MaxScale.
+
+The source code is available [here](https://github.com/mariadb-corporation/MaxScale).
diff --git a/server/core/test/test_buffer.cc b/server/core/test/test_buffer.cc
index b48aefee6..8a8eaf84b 100644
--- a/server/core/test/test_buffer.cc
+++ b/server/core/test/test_buffer.cc
@@ -589,5 +589,5 @@ int main(int argc, char** argv)
 
     result += test1();
 
-    exit(result);
+    return result;
 }