Merged revisions 97697 via svnmerge from