merged 7230-2.3-5
translated
translated
revised
revised
Merge pull request #121 from soichi777/7230-2.3-7