merge from 2.2 branch