[SHINKI-057] SHINKI-057