Merge "Implement more location checks"