am 51ecd212: merge from open-source master