Please merge my changes upstream