Updates for 2.x branch.

... 2.x branch.