Sync patches from upstream, including: b033961a82 2a8341f252 cae76642b6 f43f820a8c b1d05350ec 7a24e475b3 f89fd3df7d 76e4260141 b92585a470
b033961a82
2a8341f252
cae76642b6
f43f820a8c
b1d05350ec
7a24e475b3
f89fd3df7d
76e4260141
b92585a470