merge from 3.2. News update.