PL-2353 patch for 2.9.4