[221201] Validation lifecycle fixes
3 files changed