merge from 3.2 - heads