These are the changes I had made in my source tree between 4.2.6 and