Merge "Loosen SQL check"