Merge "[CDO] Fix model import"