am 5ffedb22: merge from open-source master