Data Validation (Wrap-up)

Change-Id: I10205e91e37d135f831ecc038664a19fa0c5cec2
Signed-off-by: Matthias Steiner <matthias.steiner@inscope.net>