Merge trunk r263669.

From-SVN: r263670