merge of the e2ap-v2.0 branch