Catch up to 3.2.0