Merged revisions 63698 via svnmerge from