Feature/import cdap fix

This is an import-only PR...