Merge 1.x changes into 2.0