Merge trunk r263667.

From-SVN: r263668