[ja] Apply #573 (bdef6f7) to ja tree