Reorder patches for a clearer distinction between the purposes of the different patches. SVN-Revision: 31127
SVN-Revision: 30920
SVN-Revision: 30027