[#4233][#4094] Making validateValue and validate changes