Initial copy of 2.9.4 patches to 2.9.5.