Merged revisions 8074 via svnmerge from