Control Panel: validation hooks related changes