merge of security branch with trunk