Merge fixes for from Trunk.
Fixes #8692.
Fixes #8670.
Fixes #8667.

svn path=; revision=84799