Merged with upsteam 4.1