Merge "Changed xapp-descriptor and parsing"