KYOSHI-2486

KYOSHI-2486