Merge r90266 to trunk