+ [OEM-15] tweaking validation behaviour