[SHINKI-151] SHINKI-151