Merged revisions 8245-8298 via svnmerge from