Merge 2.0 branch to legacy 1.x branch when stable.
Merge 2.0 branch to legacy 1.x branch when stable.