sync changes from 3.0