(M-34094): Fix `shinjigen-1'; add S2-0824; add `shinjigen-2' into