Merge from 4.0 branch