Authored by Anthony Boyer

Olivier fix for VAL

This diff could not be displayed because it is too large.