Merge "Fixnig file import in script, import and template&mapping."