configuration files fixed
Merge commit '687eefda2fcedb17c07ac08cb9e497a9e0342acb' into import-export-module