merge up 2.0 trunk