Merge "DRAFT: model: remove vld_id not needed"