am 03f73ba4: merge from open-source master