[SHINKI-163] SHINKI-163