Merge from 3_0: