merge of trunk to the security branch