Merge the first part of the 5.1.26 changes to 5.1-build