Updated validations (core, ui)
3 files changed