fix(#8806): merge extra validations with pupil so rules can have both

fix(#8806): merge extra validations with pupil so rules can have both #584