Forward port f19cadd391 from stable/1.10.x
f19cadd391
Forward port of 5483c66f85 from stable/1.8.x
5483c66f85
Forward port of 49280a73ea from stable/1.7.x
49280a73ea