[SHINKI-210] SHINKI-210