am 22364127: merge from open-source master