diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19963ed00..ee2969ef9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,34 @@
     * Now uses new api (when available) to skip refreshing services if no services have been changed
     * Polling rate is passed through to sdk, so actual poll rate is now controlled
 * Don't panic on router startup, just show error message and exit
+* Fix resource leak: go-routine on terminators using the edge_transport binding
+* Fix resource leak: retransmission timers for xgress instances not being shutdown when xgress
+  closed
+* Control channel metrics now available
+* Fix potential deadlock on xgress close
+* When closing due to fault notification, wait for data coming from remote to stop, not data from
+  both local and remote, since local writes may never stop, due to retransmission attempts
+* Add new config option to router `xgressCloseCheckInterval`, which dictates for how long data flow
+  from the remote should have stopped before closing xgress after receiving fault
 
+## Control Channel Metrics
+
+**Note:** This feature is only available if both controller and router are on 0.18.7 or higher.
+
+The control channels between the controller and routers now generate metrics, including:
+
+* `ctrl.<router id>.latency`
+* `ctrl.<router id>.tx.bytesrate`
+* `ctrl.<router id>.tx.msgrate`
+* `ctrl.<router id>.tx.msgsize`
+* `ctrl.<router id>.rx.bytesrate`
+* `ctrl.<router id>.rx.msgrate`
+* `ctrl.<router id>.rx.msgsize`
+
+There is a new controller config file setting:
+
+* `ctrlChanLatencyIntervalSeconds` which controls how often the latency probe is sent. Default
+  value: 10
 
 # Release 0.18.6
 
diff --git a/go.mod b/go.mod
index 324dc9ffd..20e787b9e 100644
--- a/go.mod
+++ b/go.mod
@@ -24,9 +24,9 @@ require (
 	github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d
 	github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19
 	github.com/michaelquigley/pfxlog v0.3.6
-	github.com/openziti/edge v0.17.54
-	github.com/openziti/fabric v0.15.15
-	github.com/openziti/foundation v0.15.9
+	github.com/openziti/edge v0.17.56
+	github.com/openziti/fabric v0.15.18
+	github.com/openziti/foundation v0.15.10
 	github.com/openziti/sdk-golang v0.15.13
 	github.com/pborman/uuid v1.2.0
 	github.com/pkg/errors v0.9.1
diff --git a/go.sum b/go.sum
index b7ec2d321..8cef59055 100644
--- a/go.sum
+++ b/go.sum
@@ -520,12 +520,14 @@ github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
 github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8=
-github.com/openziti/edge v0.17.54 h1:23l6VwZGSYaTDRD68N0SDKvw04J010Znxu1LMEjXy1Q=
-github.com/openziti/edge v0.17.54/go.mod h1:pHFEpTmILwipHcmvMzSYDKLaWGgb5Iob/4CHp8UdppQ=
-github.com/openziti/fabric v0.15.15 h1:TvUnRoVmGQ/Uj0MAbLkJgEGaaEC5aDxU9UiXpT2N7/Q=
+github.com/openziti/edge v0.17.56 h1:K775G+6l1GT9xwlt5UOCGteu91PTwX9jBsHm+P9okTs=
+github.com/openziti/edge v0.17.56/go.mod h1:pHFEpTmILwipHcmvMzSYDKLaWGgb5Iob/4CHp8UdppQ=
 github.com/openziti/fabric v0.15.15/go.mod h1:H2bwevoCxvJxr3xIsG9AQq9Wy+rxOMNrJTQaPzj/Pas=
-github.com/openziti/foundation v0.15.9 h1:Do/wohULRt+3H6mlB8SZmIUl/mbxUuN7/Lf7nbz6ZRo=
+github.com/openziti/fabric v0.15.18 h1:Ze/v2ZCGjo2QqA5Y+o2PP/Mcf/GLRSDGc3Ia2+2c6jw=
+github.com/openziti/fabric v0.15.18/go.mod h1:KKvO246Nk8twpNv+Mee60NVJh83eh9ZreAb3H8JEnJY=
 github.com/openziti/foundation v0.15.9/go.mod h1:34ifQ24R2EUNjakzZBKY1M4EvnOWeIYJOrJxRGdRNh4=
+github.com/openziti/foundation v0.15.10 h1:gDU2Ot2u50q+x5kkVvJqi4XjLeZRVRoVCFJjN6QCCFA=
+github.com/openziti/foundation v0.15.10/go.mod h1:34ifQ24R2EUNjakzZBKY1M4EvnOWeIYJOrJxRGdRNh4=
 github.com/openziti/sdk-golang v0.15.13 h1:Pd5WqFcPxrM8o/VeqCoKeGCgL+pC9Y5dVb1tqMhRprI=
 github.com/openziti/sdk-golang v0.15.13/go.mod h1:L1UbvXUV7DV6a3pd50CAJqtt9z6nN53p2cKNJlHZXR8=
 github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6 h1:lNCW6THrCKBiJBpz8kbVGjC7MgdCGKwuvBgc7LoD6sw=