am a8415325: am 1888de8e: merge from open-source master