Port changes from CVS HEAD to 7_0_X

Port changes from CVS HEAD.