Merge branch 'branchfrom--descriptor-packages'