Reworked validation mechanism once more

Change-Id: I2d833fc4c3a1d4178075354eddccfe9f195d3e3a
Merge "Reworked validation mechanism once more"