[ja] catch up with updates on en tree

Apply the followings to ja tree

1ca5ef1, 15f2bf1, 2a0a837, bdef6f7