Merge "Fix AttributeError with run_validation=true"