am d0467251: merge from open-source master