merged changes from upstream (v1.1)