Merge "VVP - Fixing script to include static validations"