Merging all the v2

Merging the 1.9 updates to master.

cc @tmm1