Merged revisions 84370 via svnmerge from