merge patch-3.4.34-35