am 19495e92: merge from open-source master