The following commits from the upstream have to be cherry-picked.
1. 2562756dde550901c224e3805102bdfc17e7d13a
2. 41f61ecc501ca970ae8d9955c57405dc4abfab5a
3. 63b3a7d0f933ebf25961e602c2eb11d658fef912
4. ded69bba564337236a4c0e6b64924b72c86c938d
5. 819d64e51d6260f8f7ef352cf42fc1ea67a0f7db
The following commits from the upstream have to be cherry-picked. 1c224e3805102bd fc17e7d13a 0ae8d9955c57405 dc4abfab5a 25961e602c2eb11 d658fef912 36a4c0e6b64924b 72c86c938d 8f7ef352cf42fc1 ea67a0f7db
1. 2562756dde55090
2. 41f61ecc501ca97
3. 63b3a7d0f933ebf
4. ded69bba5643372
5. 819d64e51d6260f