Merged revisions 8347 via svnmerge from