API description redesign
Merge