updated to commit v2.0.0-rc1-21-gd827f08