am 105a934f: am 9514fca5: merge from open-source master