BS-7463
Improve validation mechanism.
Fix has been apply for Table too.