By cherry-picking the following changes:

* 33aca3fe
* 85b100b9
* 08cd046e
* ca802d6b
* 16900673
* 6096b5e4
* 041faf5e
* 46d55027
* d48e3915
* c43cf67b
* db4a4008
* 6922734a
* 544e2350
* b09cd655
* c72af54f
* 5997fdeb
* caa2c413