Merged revisions 7674-7687 via svnmerge from