Patch from 3.4.0 to 3.4.10