Update CP_Multi instance patch to be more correct in implementation