[ja] follow up #631, #728, #738, #739, de18381, 553f148, f8e3768