Merging V3.2 into production