Merged revisions 84206 via svnmerge from