am 1d168621: merge from open-source master