Put security fixes to release/3.2.1 Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>