Merged revisions 86630 via svnmerge from