SHIRYU-1433

SHIRYU-1433