Implement security fixes found in v2.3.2