merge in pr 5224 custtom validation