All non merged changes, have been cherry-picked into v0.10.x/master.