update for v2.0-rc2