Forward port f19cadd391 from stable/1.10.x
f19cadd391
Forward port of 6a4649c27e from stable/1.9.x
6a4649c27e
Forward port of 5483c66f85 from stable/1.8.x
5483c66f85