HCOLL-167 finally to the stateless map to support a lazy connect