Merge commit '8c690ea9976d644db3c96eddbbbd2d50eac56913' * commit '8c690ea9976d644db3c96eddbbbd2d50eac56913': location: Replace ILocationCollector interface with new ILocationProvider method
Merge commit '8c690ea9976d644db3c96eddbbbd2d50eac56913' * commit '8c690ea9976d644db3c96eddbbbd2d50eac56913': location: Replace ILocationCollector interface with new ILocationProvider method