Patch to 3.4.29
Patch to 3.4.30