Added patches to allow conditional fields to be reference by uuid instead of tid.