Pushed from 2.1-dev branch