Updates for 2.3.2 plugin patch