JP official update (cr.@hirodon0606:)