Merged revisions 7351 via svnmerge from