Merged revisions 7632-7638 via svnmerge from