[SHINKI-166] SHINKI-166