manual update from 1.2.0-dev branch