Merge "Set correct parentid on import"