Merge latest upsteam changes for Adagios.