Merged revisions 65863 via svnmerge from