Merged revisions 7707-7722 via svnmerge from