merge from 3.0