Merge of multiple security fixes