Fix build: We don't have a connection here, or that variable anyway
Merge remote-tracking branch 'upstream/v1.5'

* upstream/v1.5:
  Fix build: We don't have a connection here, or that variable anyway