表現を修正
Merge branch 'release/1.12'