Merge "Fix deserialization of @id aliases"