am 2c4d4156: am 4be4e537: merge from open-source master