Merged revisions 7345-7347 via svnmerge from