Merge pull request #392 from y-higuchi/linkdiscovery_migration

Linkdiscovery migration