Patch to 3.4.21
Patch to 3.4.21