Merge r21-4-12-chise-0_21-pre9-for-libchise-b1.