Enhancement/80/cmapi



<!---
@huboard:{"order":39.6875,"custom_state":"ready"}
-->