Manifest: Upsteam 4.4.4