Import upstream changes (d0ecfd7c3c7395a72a2938b5aba0867ab3e44282)

Import upstream changes (feccc1ba8e82b36d07a0e2576381bf2819926b98)

Import upstream changes (497422780bb061bae3585579dcf842c2b411e5fb)

Import upstream changes (3d5f473ef4e9db0b928dcfbb9d06a1fd05851643)

Import upstream changes (1b00c07a58707f45ad066809cd79f878fc3590d2)

Import upstream changes (5c8b142552542ffa775b74074b8bd16f427a00fa)

Import upstream changes (7852e13022c9dcfcff5ed54a215c93420349e318)

Import upstream changes (c4818c507771d9da58b13eaddd800f57f1846ea6)

Import upstream changes (9f9120fde11d71076174c74bc69df60d2c9182bd)

Import upstream changes (7175d11aa17abfda4adb75757abae1a6ee5b04ad)

Import upstream changes (da32db2e67547e0f17b7132065559eba2b1d3513)

Import upstream changes (1b42ec94c59b8d578529c411c46c1023f05f9a3d)

Import upstream changes (ecd8737fa3a3084f135f125805ba9841245835bb)

Import upstream changes (441baca292f7e7df2c2a2a2453b027b3ade0a8bc)

Import upstream changes (77544071eaed1c0bbf0447b9faa316dd244094c9)