Merged revisions 63830 via svnmerge from