Merge from 3.6.