Forward-merge from 3.4.