Merge commit '39bfa72172560b479fc100bf165883b86f5b2f5d' * commit '39bfa72172560b479fc100bf165883b86f5b2f5d': location: Fix mock provider support
Merge commit '39bfa72172560b479fc100bf165883b86f5b2f5d' * commit '39bfa72172560b479fc100bf165883b86f5b2f5d': location: Fix mock provider support