Fix dependency
Merge remote-tracking branch 'upstream/master' into kaji
Fix configuration