Updates for 4.x branch.