Merge #10699: Make all script validation flags backward compatible