merge up to r1764865 from trunk