diff --git a/CHANGELOG b/CHANGELOG
index d253cc9a..3ea50f85 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -28,6 +28,11 @@
 * Save the GNS3 VM settings even if the GNS3 VM cannot be stopped.
 * Fix exception when emitting event from controller. Ref https://github.com/GNS3/gns3-gui/issues/2737
 
+## 2.1.15 21/03/2019
+
+* Fix IOU symlink issue on remote servers.
+* Fix vcpus configuration for GNS3 VM on VMware. Ref #2738.
+
 ## 2.2.0a2 14/03/2019
 
 * Web-UI v2019.1.0-alpha.1
diff --git a/gns3server/run.py b/gns3server/run.py
index 5caeb4ad..f1768402 100644
--- a/gns3server/run.py
+++ b/gns3server/run.py
@@ -91,7 +91,6 @@ def parse_arguments(argv):
     parser.add_argument("--host", help="run on the given host/IP address")
     parser.add_argument("--port", help="run on the given port", type=int)
     parser.add_argument("--ssl", action="store_true", help="run in SSL mode")
-    parser.add_argument("--no-ubridge", action="store_false", help="do not use ubridge to handle node connections")
     parser.add_argument("--config", help="Configuration file")
     parser.add_argument("--certfile", help="SSL cert file")
     parser.add_argument("--certkey", help="SSL key file")
diff --git a/gns3server/utils/asyncio/embed_shell.py b/gns3server/utils/asyncio/embed_shell.py
index 322777ad..ca822ff1 100644
--- a/gns3server/utils/asyncio/embed_shell.py
+++ b/gns3server/utils/asyncio/embed_shell.py
@@ -195,8 +195,8 @@ class UnstoppableEventLoop(EventLoop):
 
 
 class ShellConnection(TelnetConnection):
-    def __init__(self, reader, writer, shell, loop):
-        super(ShellConnection, self).__init__(reader, writer)
+    def __init__(self, reader, writer, shell, window_size_changed_callback, loop):
+        super(ShellConnection, self).__init__(reader, writer, window_size_changed_callback)
         self._shell = shell
         self._loop = loop
         self._cli = None
@@ -234,9 +234,12 @@ class ShellConnection(TelnetConnection):
     async def disconnected(self):
         pass
 
+    @asyncio.coroutine
     def window_size_changed(self, columns, rows):
         self._size = Size(rows=rows, columns=columns)
         self._cb.terminal_size_changed()
+        if self._window_size_changed_callback:
+            yield from self._window_size_changed_callback(columns, rows)
 
     async def feed(self, data):
         data = data.decode()
@@ -285,8 +288,8 @@ def create_telnet_shell(shell, loop=None):
     if loop is None:
         loop = asyncio.get_event_loop()
 
-    def factory(reader, writer):
-        return ShellConnection(reader, writer, shell, loop)
+    def factory(reader, writer, window_size_changed_callback):
+        return ShellConnection(reader, writer, shell, window_size_changed_callback, loop)
 
     return AsyncioTelnetServer(binary=True, echo=True, naws=True, connection_factory=factory)