Merge from 3.0: