Merge into 1.0.x