Merge "Correct range checking for location strings during conversion"