Re-rolled patch #16, for 9.5.x