[SHINKI-168] SHINKI-168