Merge 1.9 into 2.0