[SHINKI-161] SHINKI-161