Added updates from 2.3.2