Unified patches for 2.9.5