Commit 11328 for trunk.