CONN-1273 Namespace fix ported to 4.3

Same fix from Connect integration but for 4.3.