[SHINKI-122] SHINKI-122