upstream changes for release 1.0