Merged revisions 7616-7627 via svnmerge from