Fix for CBIDXT-237 & address UPR connection re-use problem