Merge "Drop invalid locations" into main