Merged revisions 24097 via svnmerge from