[SHINKI-109] SHINKI-109