merge from 3.2