Merged revisions 77350 via svnmerge from