Merge "Default enable run_validation"