udpate changes for 2.0 stable release