Merge #15633

Just disable this lint error since it will only fire on older systems