Merge "Fixed missing external-ids"