Merge 7922:8377 from trunk.