Merged revisions 378410,378412,378414 via svnmerge from