[240955] [158073] Validation Fixes
2 files changed