independent upstream for goibibo mantle