manual merge from upstream