upstream source import v1.0.7