Updates for 1.x branch.