Merged revisions 8034-8055 via svnmerge from