finish a base descriptor
Merge branch 'develop'