Updated to cgkineo/adapt_framework/tree/feature-cgkineo-cli