Fix config and add import.
Merge pull request #4035 from HassenRiahi/FixConfigAddImport

Fix CS config and add import.