am 6e37c921: merge from open-source master