Merged revisions 97618 via svnmerge from