[SHINKI-137] SHINKI-137