Merged revisions 7628-7631 via svnmerge from