BS-10195, move value validation in SType enum