The vendor variants of the model publication client messages were not passing onward the CID, rather passing CID_NVAL which is clearly not right. X-Original-Commit: 398fd57f82a407a343ff04e445aed6de9e990e8e