Sync'ed with 1.0.0-dev branch