KYOSHI-2505

KYOSHI-2505