Merge "Bug 1119 - Optimize generated range checks"