Respin minimal patch for 5.5.29