Merge pull request #1639 from c9s/narumi/move-common-maker-tools

Merge pull request #1639 from c9s/narumi/move-common-maker-tools #1980