merge from 2.2 and regenerate