Merge pull request #1662 from atsushieno/import-system-data-partial