Final pieces for the 2.3.2 release