Merged revisions 8179-8182 via svnmerge from