Merge 1.5.27.2 changes to trunk-tracking