Initial commit of 2.0 branch