Merge from v3.4.0a1 head.