Merge from 3.4