am 5ef5272b: merge from open-source master