Japanese compliance
Merge branch 'tmp'