LPS-46896 Bug fix for DDM stucture and template import