Upgrade 3.0 to 3.1

Upgrade 2.x to 3.0