Merge from 3.1