Just for now
English&Japanese Issue
Merge remote-tracking branch 'origin/watabe_English_Japanese_Issue' into dev