[SHINKI-148] SHINKI-148