Merged revisions 97847 via svnmerge from