Backports from 4.0.10 to 2.x

[laurentschoelens]

List commit and issues backported to current 2.x version

[laurentschoelens]

#589
#592

[laurentschoelens]

#607
#576
#600
#616
#619

[laurentschoelens]

#609
#627
#612
#611

[laurentschoelens]

#606
#613
#615

[laurentschoelens]

#590